Merge "Decrease load-related flakiness in ConnectivityServiceTest"
am: 5a74bcfc85

Change-Id: I22cf33a9eff84c07706d284499f87b5bd4ac157b