[automerger skipped] Merge Android 14 QPR2 to AOSP main am: af8824a4cb -s ours

am skip reason: Merged-In I224bf961f09a22da08ca573d89279bf6a76f01cd with SHA-1 095157d8af is already in history

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

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