Retirement tax questions

My Issue is fairly similar.  A 2020 1099-R with code JP.  I understand from the other answers this goes on an Amended 2019 return.  Where my question differs is there is a  2020 1099-DIV from the $25.27 capital gain that occurred as the excess had to be pulled out.

Does this 1099-DIV go on the Amended 2019 return as well?