[automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours

am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

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

Change-Id: Ie4c3c0f01b8067b6a472e63c8ad6326f44e7fbbf