[automerger skipped] Merge "Merge Android 12" am: 5282db2a81
-s ours am: a954bc4fe0
-s ours am: 45c9cb51ce
-s ours
am skip reason: Merged-In I63befde52711ce60502d5ddfcb47e6f1faddbad0 with SHA-1 27b19b918b
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1847662
Change-Id: If487827dc94bd27296fbcef48fa98bcab80cc831
This commit is contained in:
commit
e2555413d1