[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: def763b31d am: 9230f2d560 -s ours

am skip reason: Merged-In Id34eaaf1a8beab80d768186a271201e0b58d4a19 with SHA-1 11fe2048a5 is already in history

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

Change-Id: I86d8a33052047fc37c64c68c897f7becd7ba5c2a