[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 skip reason: Merged-In I81fb0f956f415014cc6b28f576ee827336277e88 with SHA-1 2ac9924a is already in history

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

Change-Id: I7cff12b3c0b96c818b7e121d2e9038d49aad9886