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

am skip reason: Change-Id I6de4610b93704406b4ea7ad1c10a5c094e2b9a74 with SHA-1 3aad8e98cc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Cluster/+/12470262

Change-Id: I9f6c8a6890826f88b737336bfef21b88182e28bd