[automerger skipped] Merge "Merge Android 12 QPR 3" am: b0eb536590 -s ours am: 7c9cf4930a -s ours am: 97dbb73578 -s ours am: e746e3538c -s ours

am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

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