Merge "Fix ConnectivityManagerTest#testFactoryReset flaky"