[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: fdbc0c96dd -s ours am: 717a852178 -s ours

am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1847707

Change-Id: I6af583b9495437bd806a02a1b434db91f059dc51