[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am: 6fcf6b2995 -s ours am: 52c9843fa0 -s ours

am skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128

Change-Id: I94d34a7b35130870e755c354c882dc49d035fb83