Merge "ConnectivityServiceTest: fix flaky tests" am: b2c16c3a95
am: 550c813eb5

Change-Id: I66f2c2174c2895224724245c1b3d815da1678955
tree: bddac0385bcf4104a33ab6e4328c35bfbdd876a6
  1. core/
  2. services/
  3. tests/