Merge "ConnectivityServiceTest: fix flaky tests"