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

Change-Id: Iaa2e3b28a3dec540b5b5ffb3fcda13ac6e020876