Merge "Merge 24Q4 into AOSP main" into main am: 4354a0877f

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

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