[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 7999f23e0d am: 44da8e6ce8 am: cc9f84fa3e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I969c7afe1ed8717b4337a1f9b1b7644366f9eb5d