Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ifacab4b9155dfc956a1dcf41af50acb152cd4ee1
Change-Id: I3b63a93fc23876c45fc526a0be229ee2fbe58438
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 35a11fd..07e6b7d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,4 +1,32 @@
 {
+  "extservices-mainline-presubmit": [
+    {
+      "name": "TextClassifierNotificationTests"
+    },
+    {
+      "name": "TextClassifierServiceTest"
+    },
+    {
+      "name": "libtextclassifier_tests-sminus"
+    },
+    {
+      "name": "libtextclassifier_java_tests"
+    }
+  ],
+  "extservices-tplus-mainline-presubmit": [
+    {
+      "name": "TextClassifierNotificationTests"
+    },
+    {
+      "name": "TextClassifierServiceTest"
+    },
+    {
+      "name": "libtextclassifier_tests-tplus"
+    },
+    {
+      "name": "libtextclassifier_java_tests"
+    }
+  ],
   "presubmit": [
     {
       "name": "TextClassifierServiceTest",