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

am skip reason: subject contains skip directive

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

Change-Id: I71a574b7d054422e60e38953709452d9bc28a9f0