[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 6691c7847e am: f64b19d7ee -s ours am: c84f6bbc27 -s ours am: 6ae2d75bba -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: Iff5398a90d07ddb22bf203cae33bc08a3fef3749