Merge "ConnectivityServiceTest: fix flakyness"
tree: 7fb9b28b3bc96a4afa438c89b6d2b7d33bba5d04
  1. core/
  2. services/
  3. tests/