Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203
am: 8fea8e5bbd

Change-Id: I66f2c2174c2895224724245c1b3d815da1678955