[automerger skipped] Merge 24Q3 to AOSP main am: 769372acbe -s ours am: ee543996dc -s ours

am skip reason: Merged-In I271dc8c204b86c139b3ce39aec94992455948c31 with SHA-1 6075e73b8d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3255571

Change-Id: I0d4773efc6d4c506cfe060c1d295a7cf2e23f779
Signed-off-by: Automerger Merge Worker <[email protected]>