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

Change-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4