[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: 602f36a0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5de7704ce6d66cd542d3600d337e602221395937