Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4
am: 652dffda0b

Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18