You would need to amend 2019 for the code P 1099R but indicating this was reported on a 2020 1099R. The code 8 1099R represents "Excess contributions plus earnings/excess deferrals (and/or earnings) taxable in 2020." This 1099R you would include on your 2020 return.
The 2020 1099R state boxes were modified. The 2020 1099R state boxes are now 14-16 and the local boxes are 17-19. These boxes would correlate to state boxes 12-14 and local boxes 15-17 on the 2019 1099R.
The 1099 Series are informational reporting forms submitted to the IRS by third parties. The IRS then matches the form information to your tax return to insure all income is reported and taxed. If you do not include a 1099 received from a third party on your tax return, you will receive a notice from the IRS asking why. This is the CP2000 matching notice. If you receive this notice from the IRS, make sure and respond by the date indicate on the notice.