Merge "Add connectivity pre-check for net permission cts tests" am: 24c29ac6a5

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

Change-Id: Id82658a30d9aff4df4d4703ed7b83fdae7901167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/cts/netpermission/internetpermission/Android.bp

@@ -29,5 +29,5 @@ android_test {
         "cts",
         "general-tests",
     ],
-
+    host_required: ["net-tests-utils-host-common"],
 }

tests/cts/netpermission/internetpermission/AndroidTest.xml

@@ -24,6 +24,8 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetTestCasesInternetPermission.apk" />
     </target_preparer>
+    <target_preparer class="com.android.testutils.ConnectivityTestTargetPreparer">
+    </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.networkpermission.internetpermission.cts" />
         <option name="runtime-hint" value="10s" />

tests/cts/netpermission/updatestatspermission/Android.bp

@@ -29,5 +29,5 @@ android_test {
         "cts",
         "general-tests",
     ],
-
+    host_required: ["net-tests-utils-host-common"],
 }

tests/cts/netpermission/updatestatspermission/AndroidTest.xml

@@ -24,6 +24,8 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetTestCasesUpdateStatsPermission.apk" />
     </target_preparer>
+    <target_preparer class="com.android.testutils.ConnectivityTestTargetPreparer">
+    </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.networkpermission.updatestatspermission.cts" />
         <option name="runtime-hint" value="10s" />