[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 266e0ce537 -s ours

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

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

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