Merge "NPE in BluetoothDevice.fetchUuidsWithSdp"