[automerger skipped] Merge Android 14 am: 0ebec9584d -s ours am: 670789f96d -s ours

am skip reason: Merged-In I086eec8d1726b9f0c42a7b1a26dfcc93f394106e with SHA-1 40fa6e18cd is already in history

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

Change-Id: I55826b039d53ee8545ea37dfc8e1e92694f95173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>