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

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

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