[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -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: I0d302c8ffacb6e4eba20461ccccbe6b6a710fa6f