[automerger skipped] Merge "[DO NOT MERGE] Add group 'uhid' to sensors...

[automerger skipped] Merge "[DO NOT MERGE] Add group 'uhid' to sensors multi-HAL." into tm-qpr-dev am: 7a83695d -s ours

am skip reason: Merged-In Iddbb4b83f20955d7c316d0eee391effcf30f5b4f with SHA-1 df791de7 is already in history

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



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