Merge "Decrease load-related flakiness in ConnectivityServiceTest"