[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 7b2d3309b8 -s ours am: 6d8e0945cc -s ours am: 1c18f3ac09 -s ours am: fe84edbf77 -s ours

am skip reason: Merged-In I95a48cbc91399c2d8c8396689eae8e9b34dadc66 with SHA-1 e5dc864215 is already in history

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

Change-Id: I6ffbce22658db2dd71abe2ef584bc750afa5b4a4