Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203 am: 8fea8e5bbd am: c620e64f61
am: 5bad599e2e

Change-Id: I3a16ff459b8f702249f14e9becbb2630ce7471fd