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

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

Change-Id: I6cabe8effba0b7e934749da26eacb2f8d85c2441