Should a 2019 1099-R form, that consists solely of a removal of excess that was done before 2018 taxes were due be filed under my 2019 return or as an amendment to 2018?

In early April 2019, I discovered I contributed an excess amount to a Roth IRA as I was filing my 2018 taxes. I had this amount + taxable earnings removed from the account PRIOR to filing  my 2018 tax return.  Because this occurred in 2019 technically, it led to a 1099-R form (I have codes "J,P" on this form) for 2019, even though I had it removed before 2018 taxes were due. Note - on my 2018 taxes, I mentioned that a) X amount was contributed to the Roth (line 20) and then b) X amount was was removed (line 26 "Enter any contribution included on line 25 withdrawn before the due date of the tax return"). 

Now my questions are:
- Do I include this form in my 2019 taxes?
- Do I need to amend 2018? If so, how does this work - do I add the same 1099?
- If I do both of the above, doesn't this mean I am paying taxes twice? I did add, remove, then add the 1099-R to my current 2019 to see how it would influence my tax amount due and it looks it doesn't change it (perhaps this is due to the codes in Field 7)?

 

@dmertz , @macuser_22  - I have seen both of you help others with a similar issue, can you please advise?