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

Change-Id: I3e1c31d878b8f2899a3ff8b88ab565eb7856d477