[automerger skipped] DO NOT MERGE - Merge Android 13 am: 797d7d2b -s ours am: 3e40380c -s ours

am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441 is already in history

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



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