[automerger skipped] Merge "Merge Android 12L" am: 5935794511 -s ours am: 3def5591b0 -s ours

am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694

Change-Id: I09a86f6de73ef9b02bbe89a67cd9104db6303d02