[automerger skipped] Merge "Merge Android R" am: 2172474d -s ours am: c975ecfe -s ours am: 4b028fac -s ours

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

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

Change-Id: Ib919ddf67b6dfc8166fd0a62591426516caa8c86