Merge "[DO NOT MERGE] Add group 'uhid' to sensors multi-HAL." into tm-qpr-dev-plus-aosp