Merge "[Trust] Add test target for tablets." into tm-dev am: a4a4f42b3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17747648

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

core/java/android/app/trust/TEST_MAPPING

@@ -11,5 +11,18 @@
         }
       ]
     }
+  ],
+  "trust-tablet": [
+    {
+      "name": "TrustTests",
+      "options": [
+        {
+          "include-filter": "android.trust.test"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
   ]
 }

services/core/java/com/android/server/trust/TEST_MAPPING

@@ -11,5 +11,18 @@
           }
         ]
       }
+    ],
+    "trust-tablet": [
+      {
+        "name": "TrustTests",
+        "options": [
+          {
+            "include-filter": "android.trust.test"
+          },
+          {
+            "exclude-annotation": "androidx.test.filters.FlakyTest"
+          }
+        ]
+      }
     ]
   }

tests/TrustTests/TEST_MAPPING

@@ -11,5 +11,18 @@
         }
       ]
     }
+  ],
+  "trust-tablet": [
+    {
+      "name": "TrustTests",
+      "options": [
+        {
+          "include-filter": "android.trust.test"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
   ]
 }