Merge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp