Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0
am: 0d506fc4f4

Change-Id: I630392c4c7dbfd52bf3378f9435cf0cb5b328f6a