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

am skip reason: Change-Id I25a69ac99dc29101979d772e91feb440d1a16614 with SHA-1 0525c2bbde is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/12470247

Change-Id: I0718ece308fb5023293f82a72ad6857365786450