[automerger skipped] Merge 10952656 am: c0ca8f958d -s ours

am skip reason: Merged-In I72bf109e6bc12a34721c967d20943cdeac63a7d1 with SHA-1 9264ec7103 is already in history

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

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