[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 11cfd4aeab -s ours am: 1c179410a9 -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: I7e09a905c2dd5f1fabb987c43522ae7caefe4f11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>