Merge "Merge 24Q4 (ab/12406339) into aosp-main-future" into aosp-main-future am: 1e4e041f75

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

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