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

Change-Id: If210f213c7840c218d5e847667c7613d53f86661