F1 announces revised calendar for 2021