[automerger skipped] Merge "Merge Android 12L" am: c2b7fb4aad -s ours

am skip reason: Merged-In Ice502eaba6c5dd8ca1157d3fde1b5b5b223267e4 with SHA-1 466b596cc5 is already in history

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

Change-Id: I6bb2fd8bd268fd95b7513288ceb74758335dd242