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

Change-Id: Ib5c91460b57d58fad612c6bab74009b9282485bd