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

am skip reason: Merged-In I99c949e20bd4e352083118bd8064042fed56cba1 with SHA-1 3ce31078c3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/31817754

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