Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future am: c84ee177

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



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