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

Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda
tree: 63d99bf876dcdc86c127a0fd3a15fe3bbbe749f2
  1. core/
  2. services/
  3. tests/