Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 4148fe64b9 am: 1005e82639
am: 2a7985a6d0

Change-Id: I3d53ece1c18cf1cf1e5e361231e321dcd59b5bad