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