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

Change-Id: Iaa1ab50a323133cadfa4f39440fce982cde8d1fe
tree: 6cd990f7242787d2822c778f5065fb1ae1e9f652
  1. core/
  2. services/
  3. tests/