[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 6691c7847e am: f64b19d7ee -s ours am: c84f6bbc27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8df9c6319edd5753b3d79f648498bdfc6c16d142