Merge "Add locksettings unit tests to presubmit" am: 643fb23a74 am: ffa9add6c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a3638ae90b88f68bcc770f32a4d379ce22c7877

1 files changed, 11 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/locksettings/TEST_MAPPING b/services/core/java/com/android/server/locksettings/TEST_MAPPING
index 56f5cc034f05..8c19c541b86f 100644
--- a/services/core/java/com/android/server/locksettings/TEST_MAPPING
+++ b/services/core/java/com/android/server/locksettings/TEST_MAPPING
@@ -10,6 +10,17 @@
                     "exclude-annotation": "android.platform.test.annotations.FlakyTest"
                 }
             ]
+        },
+        {
+            "name": "FrameworksServicesTests",
+            "options": [
+                {
+                    "include-filter": "com.android.server.locksettings."
+                },
+                {
+                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+                }
+            ]
         }
     ]
 }