[automerger skipped] Merge Android 12L am: 7381b4d4 -s ours am: c8213749...

[automerger skipped] Merge Android 12L am: 7381b4d4 -s ours am: c8213749 -s ours am: f34c6242 -s ours

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

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

Change-Id: Ieb6d8d4e2f1cccd38898a8fbb8f6e9b2ec3601b6