Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main