DO NOT MERGE - Merge ab/7272582 am: eb35161303

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

Change-Id: I32c372ba33aae96baa92daed643c5ee01d4c4282