Merge "DO NOT MERGE - Merge ab/7272582" am: 7999f23e0d am: 44da8e6ce8

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

Change-Id: Ib119fc5acca810df66cd965430adcf02f84f0571