[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf -s ours am: 822cf94a -s ours

am skip reason: Merged-In I348aac2cfcf84032e2526d03cc0adc989d3d0153 with SHA-1 db22144a is already in history

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



Change-Id: I82709426e015bfdf05b1b991767c9564ddfa64c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>