Merge "Fix deadlock in CachedBluetoothDeviceManager"