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

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

Change-Id: Ifff61910819de4da66bc5558074a573651a5aec3