Yes, if your 1099-R has the code P in box 7 then you will have to amend your 2017 tax return and include the 1099-R in on you 2017 return. And it will not have to be included on your 2018 tax return.
https://ttlc.intuit.com/replies/6603004
