Can I report an excess Roth IRA contribution made in July 2020 for the 2019 tax year on my 2020 tax return? Or do I need to file an amended 2019 return?

Note, the full amount of the excess contribution, plus earnings, will be withdrawn before April 15, 2021 to avoid the 6% penalty.  I assume all earnings should be reported on the 2020 return, is this correct?