Merge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()"