Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: 7ff5f631b0

Change-Id: I93da1059a21adcf14f8c036c17963a07b1db964d