[automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours am: 8f26d0a018 -s ours am: ab6fc1a11b -s ours am: 3637c83b14 -s ours

am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: I6a837494a4ae5c8f5911e106fc68e6be8fd41001