Merge changes from topic "cherrypicker-L34800000954905788:N57900001270872696" into tm-dev am: 52f0fe0c47 am: 3ac6da7e42

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18727990

Change-Id: Ib7e8bcade028381a8a27c046ba3b8c33b432e9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index fd6c165..b90eeac 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -199,6 +199,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -3414,6 +3415,7 @@
         }, NETWORK_SETTINGS);
     }
 
+    @Ignore("TODO: temporarily ignore tests until prebuilts are updated")
     @Test @IgnoreUpTo(SC_V2)
     public void testFirewallBlocking() {
         // Following tests affect the actual state of networking on the device after the test.