Merge "Add error log to BluetoothAdapter.factoryReset() and make...
Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" am: a74b5a79 am: 8dc95109 am: 500f1832
Change-Id: Ib5c91460b57d58fad612c6bab74009b9282485bd