Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable"
am: b4dbfff366

Change-Id: If06bce0f62fee4121c0e4445178c13458cd4b7c6