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

Change-Id: Iebafbf438ee4efcd53b3e6d5c71b34c0ca4e2c6b