[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE...

[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: c1f7e463 -s ours am: 9d81eb79 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia9b945a7dee267e19ce56e4e906dee7581affec1