[automerger skipped] Merge Android U (ab/10368041) am: db48564f25 -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: I26d8ce12bd95cea1820bbe1423edfbc7fba602a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>