[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 8c87752c...

[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 8c87752c -s ours am: 43c4ec0f -s ours

am skip reason: Merged-In I4a94280ef2ff63b569d43d8cd90de5a8f2058be9 with SHA-1 10906635 is already in history

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



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