Merge "Adding 'uhid' permission for access to /dev/uhid." am: cecbc9993d
am: 04daed4793

Change-Id: I2bcaa5fe48f60c837ac341c71819c492860f50e2