Merge "API level 30 upgrade: AOSP/Calendar" am: 58bb98b529

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1768565

Change-Id: Ia90b6c0b0c612b9113d55e6bc0649a322f4dc393