[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8c1 -s ours am: 6c21bdeb90 -s ours am: fbe1853e45 -s ours am: 1964e5b9a0 -s ours am: 45a87913be -s ours

am skip reason: Change-Id Id0fd2855f322967c1169f246d44e55a9dfdad6bb with SHA-1 934505ba52 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12470106

Change-Id: Idc526b7d61eefd8170f085f66a678c9e07098a71