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

am skip reason: Merged-In Ic565fe36c2a3f99185344d7fe48f3ad6610921b1 with SHA-1 d14440fc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/31816536



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