Merge "ConnectivityServiceTest: remove flaky waitForIdle test."