[automerger skipped] Merge Android 14 am: 7915e04466 -s ours am: 6d2a096b11 -s ours am: 60b25f3ed2 -s ours am: b493b4c758 -s ours

am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

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