[automerger skipped] Merge Android 14 am: 7915e04466 -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: I813f802b38e8d7c324de6b0466ed199c2a237b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>