Merge "ConnectivityServiceTest: eliminate remaining sleep()"