[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c67 -s ours

am skip reason: Change-Id I0181ce6e0a8271fcfdfbfb5b8e5c64791693d07f with SHA-1 4b028fac is in history

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

Change-Id: Id8104464c62a01be2b0db3e56c515b91015f7578