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

Change-Id: I9b1c77bd8d0710736f1f29b204acc3a162e833fb