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

Change-Id: Icde5c7bccb2e7f4f5a8ae9e44d8a44dcce0234f7