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

Change-Id: I420cd819d30b701b9d796457de8f63d0d97008db