Merge "Fix failing tests in CachedBluetoothDeviceManagerTest" into main