Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()""