[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c86c769102 -s ours

am skip reason: Merged-In I11cfdae56524722afd33ee3c01fdb3c1559d8c85 with SHA-1 edfcd7d421 is already in history

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

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