Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1e3624527b am: 962f1842ca am: a3909e0583
am: d5e3d66e07

Change-Id: I3d7c4b4752143983bc67f72120883d45925129f7