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

am skip reason: Change-Id I9ee2bd1792ad9705c8cb201fdcb5ac4a220a5ea1 with SHA-1 1145d068a8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12470108

Change-Id: I0856f92903a715219e43fb3f57a355d8d546fbbf