[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 0d78eac396 -s ours

am skip reason: Merged-In Id0c69dbc5827202f834e0f6f1a9bf39395e8b597 with SHA-1 2b686fcd97 is already in history

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

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