[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: f74b62e80a -s ours

am skip reason: Merged-In Ibe1a49a38a05ecfb623c64fb48c812cc422a54e3 with SHA-1 e9a3fbdae4 is already in history

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

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