Merge history of CTS

BUG: 167962976
Test: TH
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Change-Id: Iff9a8cabe6150c81f199979e802f63790e73b334
diff --git a/tests/cts/net/TEST_MAPPING b/tests/cts/net/TEST_MAPPING
new file mode 100644
index 0000000..3162e22
--- /dev/null
+++ b/tests/cts/net/TEST_MAPPING
@@ -0,0 +1,23 @@
+{
+  // TODO: move to mainline-presubmit once supported
+  "postsubmit": [
+    {
+      "name": "CtsNetTestCasesLatestSdk",
+      "options": [
+        {
+          "exclude-annotation": "com.android.testutils.SkipPresubmit"
+        }
+      ]
+    }
+  ],
+  "mainline-presubmit": [
+    {
+      "name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]",
+      "options": [
+        {
+          "exclude-annotation": "com.android.testutils.SkipPresubmit"
+        }
+      ]
+    }
+  ]
+}