[automerger skipped] Merge "Merge Android 12 QPR1" am: 003e0f8c3a -s ours am: 057fb89ef7 -s ours

am skip reason: Merged-In Ic5d56619c6d4baea7610bfe80293cb8616acbd47 with SHA-1 c427756f81 is already in history

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

Change-Id: Iaa18dba1e008e7495d14f386997c20f8b94ff5a0