[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: b6d9b68e -s ours

am skip reason: Merged-In I85787a9ebe95a709c7ac6977218511c113263294 with SHA-1 e93314f1 is already in history

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



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