[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: b0ef392780 -s ours am: 7a58f58b4a -s ours

am skip reason: Change-Id I0fc2d22b950abce0fa3fe28d0371a6b665f5bf9f with SHA-1 75d9627d55 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/12470259

Change-Id: I34649a13738a36d676c4b2f59a68bf49773ef324