[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 3a714c2fa6 -s ours am: e76be36661 -s ours

am skip reason: Change-Id I026923360abee43c063ee7fb0f7557da8ffb8548 with SHA-1 c93a74b0ae is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/12470124

Change-Id: I332221a090ca3b0ad3924ca88d92dbeb3ce526ec