[automerger skipped] Merge 24Q4 into AOSP main am: 4018a5f01c -s ours

am skip reason: Merged-In Ia2b29836910a8da00d498cb5dc067469621b30fd with SHA-1 f17202f7ce is already in history

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

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