Merge "EthernetTetheringTest: test testTetherClatTcp on S+ device" am: 75a819d9ff am: 51a44d2882

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

Change-Id: I94a093aaa80e02b68e8ac6a89f02fe289f2963a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
index 43aff7e..2dcf9d7 100644
--- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
+++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
@@ -1943,7 +1943,9 @@
                 tester, false /* isClat */);
     }
 
+    // TODO: support R device. See b/234727688.
     @Test
+    @IgnoreUpTo(Build.VERSION_CODES.R)
     public void testTetherClatTcp() throws Exception {
         // CLAT only starts on IPv6 only network.
         final TetheringTester tester = initTetheringTester(toList(TEST_IP6_ADDR),