[automerger skipped] Merge "Merge Android 12" am: 436a520a -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 436a520a -s ours am: 60c3c08a -s ours am: aaccc651 -s ours am: 3ba15f27 -s ours

am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f is already in history

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

Change-Id: If1040141b42d035932562c715adab7cd39306c26