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

am skip reason: Merged-In Icd2865c2761eaf3b7cba9b8b62a45a55b43cc5f0 with SHA-1 be3797e0 is already in history

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



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