[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: b7e1b4fc -s ours

am skip reason: Merged-In I30915c907c06f577d6428af8aa745dd94c674dc1 with SHA-1 3685883c is already in history

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



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