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

am skip reason: Merged-In I907687a4d71f48869617edc6e013639dfbccb851 with SHA-1 4172a388c7 is already in history

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

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