[automerger skipped] Merge Android 12L am: d36a4710b1 -s ours am: ce05f25ef5 -s ours am: 46143e52bc -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: Id59c7a7e20f44b2148f658c1f23dd4bb85b8e51c