Merge "Fix a way for this test to flake." am: 43370c622d am: ff47147c3a am: 15da51da4c

Original change: https://android-review.googlesource.com/c/platform/cts/+/1436794

Change-Id: I985f21d48aa647b4b07d1268717f67500c149cdc

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

@@ -224,6 +224,16 @@ public class ConnectivityManagerTest {
         if (mCtsNetUtils.cellConnectAttempted()) {
             mCtsNetUtils.disconnectFromCell();
         }
+
+        // All tests in this class require a working Internet connection as they start. Make
+        // sure there is still one as they end that's ready to use for the next test to use.
+        final TestNetworkCallback callback = new TestNetworkCallback();
+        mCm.registerDefaultNetworkCallback(callback);
+        try {
+            assertNotNull("Couldn't restore Internet connectivity", callback.waitForAvailable());
+        } finally {
+            mCm.unregisterNetworkCallback(callback);
+        }
     }
 
     /**