Merge "ConnectivityServiceTest: remove flaky waitForIdle test." am: be80577f am: 0c659d20 am: f8cff961 am: 420ad974 Change-Id: Iebafbf438ee4efcd53b3e6d5c71b34c0ca4e2c6b