Merge "ConnectivityServiceTest: fix flaky tests"
am: ee4f8f30eb

Change-Id: I0577f6b48de8a95e7d12e58a672fb0374ced9403
tree: d014db77ce46b182a35e0d39b32817b1924b1a17
  1. core/
  2. services/
  3. tests/