Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
am: 9e3297a099

Change-Id: I0639d4ccd7c3211595ede82bce3daa87ae759e10