[automerger skipped] Merge Android U (ab/10368041) am: 45ac23884b -s ours

am skip reason: Merged-In I3a2cc392c64955bed5b18d1aacfcbd08d8bc34db with SHA-1 6bae1b6481 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhidl/+/24182911

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