[automerger skipped] Merge 24Q4 into AOSP main am: 87a1ee27 -s ours am: 997d406d -s ours

am skip reason: Merged-In Idddd5d3e38e2d14bb1becdffbc0649b2f3bb5dae with SHA-1 5d2b9017 is already in history

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



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