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

Change-Id: Ib879f947b1db9579ec46efc79351a3b9247c09c8