Snap for 8311971 from bf3206bcd61a2b49492736a5054acf83d69c739b to mainline-cellbroadcast-release

Change-Id: Ib6651c63a244f90a1a12ad76fa4cd47c6536c058

apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java

diff --git a/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java b/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java
index a6ca1f1..3e7eb16 100644
--- a/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java
+++ b/apishim/29/com/android/networkstack/apishim/api29/ConstantsShim.java
@@ -16,6 +16,11 @@
 
 package com.android.networkstack.apishim.api29;
 
+import android.os.Build;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+
+import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 
 /**
@@ -44,4 +49,16 @@
 
     // Constants defined in android.content.Context
     public static final String NEARBY_SERVICE = "nearby";
+
+    /** Compatibility class for {@link CarrierConfigManager}. */
+    @RequiresApi(Build.VERSION_CODES.Q)
+    /** See {@link CarrierManager#KEY_CARRIER_SUPPORTS_TETHERING_BOOL} */
+    public static final String KEY_CARRIER_SUPPORTS_TETHERING_BOOL =
+            "carrier_supports_tethering_bool";
+
+    /** Compatibility class for {@link Settings}. */
+    @RequiresApi(Build.VERSION_CODES.Q)
+    /** @see android.provider.Settings#ACTION_TETHER_UNSUPPORTED_CARRIER_UI */
+    public static final  String ACTION_TETHER_UNSUPPORTED_CARRIER_UI =
+            "android.settings.TETHER_UNSUPPORTED_CARRIER_UI";
 }

tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java

diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java b/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
index 4d2a860..7aef0e3 100644
--- a/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
+++ b/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java
@@ -1402,7 +1402,7 @@
         assertIpMemoryStoreNetworkAttributes(TEST_LEASE_DURATION_S, currentTime, TEST_DEFAULT_MTU);
     }
 
-    @Test
+    @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
     public void testRollbackFromRapidCommitOption() throws Exception {
         startIpClientProvisioning(false /* isDhcpLeaseCacheEnabled */,
                 true /* isDhcpRapidCommitEnabled */, false /* isPreConnectionEnabled */,