Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev