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

Change-Id: I0043c4a4c96f7ee39b9036060897dbf85222c6e6