Merge "Decrease load-related flakiness in ConnectivityServiceTest" am: 4b4f463d3c am: 19911998ab am: a15d9b6990
am: 23ce5f317f

Change-Id: Ic9e2f620ad30b2fbe2097233ab2a1e17ed0e59cd