[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6b3621a8 -s ours am: 6c21bdeb -s ours am: fbe1853e -s ours am: 1964e5b9 -s ours

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

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

Change-Id: I156007c32f71a192c90c89259472585b6edc724b