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

Change-Id: I8ecc2290d58b9e8f570ec404bbde1a2a60a89b75