Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1e362452 am: 962f1842 am: a3909e05 am: d5e3d66e Change-Id: I3d7c4b4752143983bc67f72120883d45925129f7