I think I'm good until 3/31/2022.
"2019 Status Extension. All members whose 2019 status was scheduled to be downgraded on March 31, 2020—whether it’s Diamond, Gold or Silver—will automatically receive an extension through March 31, 2021."
"2020 Status Extension. We are extending your 2020 member status through March 31, 2022. This means you will continue to enjoy all the Diamond, Gold or Silver benefits you have access to today for the next 24 months."
I think if you had waited until after March (downgrade in April) then due to the extension, it would last until 2022. But you didn't know. Still - you may just get lucky and it will continue on until 2022.