Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558 am: fbf163294a

am: 0550352f2e

Change-Id: I3541b76296d2de1f7d34d8124fc4ee90595841da

1 files changed, 13 insertions, 0 deletions

diff --git a/services/devicepolicy/TEST_MAPPING b/services/devicepolicy/TEST_MAPPING
index ab85a6873cf6..a5ee3e24e14a 100644
--- a/services/devicepolicy/TEST_MAPPING
+++ b/services/devicepolicy/TEST_MAPPING
@@ -1,4 +1,17 @@
 {
+  "presubmit": [
+    {
+      "name": "CtsDevicePolicyManagerTestCases",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.LargeTest"
+        }
+      ]
+    }
+  ],
   "postsubmit": [
     {
       "name": "CtsDevicePolicyManagerTestCases"