Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"