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

am skip reason: subject contains skip directive

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

Change-Id: Iadfae6144dc9ed7e175b5eaadc846b8c6523e365