Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 8a69fa1853

Change-Id: I8b43f896064dddb84986b5a8d6edad1116028a5b