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

Change-Id: I99a86fe849bc53db28c270680546d4035c0a8610