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

am skip reason: Change-Id Id782248e3da0cc6c37aad6a0fd6e6d60e70160bf with SHA-1 da18fd46df is in history

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

Change-Id: I87046054a04b883f2bb848bb7dc064a3e259b96d