Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 5b906a4ece am: 6c65982d2b am: 80bc56bf2a
am: f6362d50a6

Change-Id: I9b1c77bd8d0710736f1f29b204acc3a162e833fb
tree: 9094f8e64a7ff3376e0e2832dc1f33e49bb2d61f
  1. core/
  2. services/
  3. tests/