Merge "Adding 'uhid' permission for access to /dev/uhid."