[automerger skipped] Merge Android U (ab/10368041) am: db48564f25 -s ours am: 637ef2dfcb -s ours am: 65386c7974 -s ours am: 2de650cab9 -s ours

am skip reason: Merged-In I9849ac965be2dc1ddc4a8ab634cefc2077640105 with SHA-1 ee877f8ab9 is already in history

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

Change-Id: I38a3e1f34341858be9a07b42f2cbd77d287441e1
Signed-off-by: Automerger Merge Worker <[email protected]>