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

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11 am: 76a81f92 -s ours am: 77fc5fd4 -s ours am: ca1ba9ee -s ours am: b75d08ff -s ours am: 54903444 -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: I3f3fdabbf14382aab019a2cd28d33c9e55f7adf8