Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 66788dc4d8 am: 2d452e6c48
am: 80bc56bf2a

Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda