Merge "ConnectivityServiceTest: fix flaky tests" am: b2c16c3a95 am: 550c813eb5 am: 17f86737ec
am: cbbb8019b5

Change-Id: I3a16ff459b8f702249f14e9becbb2630ce7471fd
tree: 84fea349b92b0ecd80b4469a85aa5e6243076edb
  1. core/
  2. services/
  3. tests/