[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf35 -s ours am: 822cf94aa0 -s ours am: 555944e12f -s ours am: 25e6f22a9f -s ours am: ae03425d63 -s ours

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

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

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