Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am: be80577f5b
am: 0c659d2065

Change-Id: I7fbf2cb2c9778f5c961335c5b9fd5a138ec140db