[automerger skipped] Merge Android U (ab/10368041) am: 4d52a58120 -s ours am: 1e7b3919d1 -s ours am: f35dae6311 -s ours am: 9faf379252 -s ours

am skip reason: Merged-In I0b5ddd4cd207c63185f38a57806b9bae38e82e4d with SHA-1 849c7b054e is already in history

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

Change-Id: I454872a3ce79fe4e6b5020423e9d174911fefdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>