Android S v2 Preview 2 (S2B2.211203.006)
Merge "API level 30 upgrade: AOSP/Calendar" am: 58bb98b529 am: 6e72fca665

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

Change-Id: I43181ebbd8b9cff17a34dd7de569be1d8b5fbc10