Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353
am: 96d3b668bb

Change-Id: I38a84e41505f7c55966d5ddedd12ddf5f1e9f403