[automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours

am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

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

Change-Id: Ia3b57074613c623ea3105505c4b32b29baba3436