Merge "Bump the min sdk of Tethering" into main

Tethering/Android.bp

@@ -22,7 +22,10 @@ package {
 java_defaults {
     name: "TetheringApiLevel",
     sdk_version: "module_current",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
 }
 
 java_defaults {

Tethering/tests/privileged/Android.bp

@@ -53,5 +53,8 @@ android_test {
         "TetheringApiCurrentLib",
     ],
     compile_multilib: "both",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
 }

Tethering/tests/unit/Android.bp

@@ -45,7 +45,10 @@ java_library {
 
 java_defaults {
     name: "TetheringTestsDefaults",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",

tests/common/Android.bp

@@ -77,7 +77,10 @@ java_genrule {
 
 android_library {
     name: "ConnectivityCoverageTestsLib",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
     static_libs: [
         "ConnectivityUnitTestsLib",
         "NetdStaticLibTestsLib",
@@ -93,8 +96,10 @@ android_library {
 
 android_test {
     name: "ConnectivityCoverageTests",
-    // Tethering started on SDK 30
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
     test_suites: [
         "general-tests",
         "mts-tethering",