[automerger skipped] Merge Android 12 QPR 3 am: 9e5c95612b -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: Ice06d9e2407d1f617c7e95744b3e8d9513c724b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>