[automerger skipped] Merge Android 12L am: ebebf51c4f -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: I0a2e1695d50a97fd80985594bfbd722edeb0749a