aml_tz4_331012000
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 80020b6217 -s ours am: 093487c19a -s ours am: ddd2f63ef7 -s ours

am skip reason: Merged-In If48ec18ead389648326581322b064434a9741d4a with SHA-1 90fa573d0e is already in history

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

Change-Id: If83cdb4089fb60fa5303ccd9887c5402b2b88128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>