[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb4 am: d3865b7a -s ours am: c4eabe78 -s ours am: c00dfe5d -s ours

am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb09173 is in history

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

Change-Id: I42caf6fa0e5a430001a3097eb4f57bcf267daaa4