Merge "Convert apct/framework/presubmit-cloud-tf to Test Mapping Suite." am: 888c3b0347 am: f5c7e1b90a

am: 8da67c7571

Change-Id: I46c9b304a1445f0f6b51e64e7e6b01a6aa3653c8

1 files changed, 28 insertions, 0 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index b1c4cad72dc9..2b12da291acb 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -23,6 +23,34 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
+    },
+    {
+      "name": "FrameworksCoreTests",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    },
+    {
+      "name": "FrameworksServicesTests",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
     }
   ],
   "postsubmit-managedprofile-stress": [