[automerger skipped] Merge ab/7061308 into stage. am: fea7439a -s ours am:...

[automerger skipped] Merge ab/7061308 into stage. am: fea7439a -s ours am: 8d12226c -s ours am: e8354919 -s ours

am skip reason: Change-Id I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic27161d13c2283eb560d122d03c12db427dee7c3