[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 8a951f4eb8 -s ours am: 107ca2d6b1 -s ours

am skip reason: Change-Id I43f896443fd0b36d3538b242bdaa859181eb8eee with SHA-1 31adf69cd8 is in history

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

Change-Id: Id22def952ec7d7f09cbdd0c0afe8cafd80e4e1ad