Merge "Add testAppOps test to TEST_MAPPING." into rvc-dev am: ebe2773f3d am: daf1861655 am: 6cf9be197f

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

Change-Id: Ib42b1ea1fcfa46a65d1971d1f5e8cc8ac89baa48

core/java/android/app/TEST_MAPPING

@@ -27,6 +27,15 @@
                 }
             ]
         },
+        {
+            "file_patterns": ["(/|^)AppOpsManager.java"],
+            "name": "CtsStatsdHostTestCases",
+            "options": [
+                {
+                    "include-filter": "android.cts.statsd.atom.UidAtomTests#testAppOps"
+                }
+            ]
+        },
         {
             "file_patterns": ["(/|^)AppOpsManager.java"],
             "name": "CtsPermission2TestCases",

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

@@ -43,6 +43,14 @@
                     "include-filter": "android.app.cts.ActivityManagerApi29Test"
                 }
             ]
-        }
+        },
+        {
+            "name": "CtsStatsdHostTestCases",
+            "options": [
+                {
+                    "include-filter": "android.cts.statsd.atom.UidAtomTests#testAppOps"
+                }
+            ]
+        }        
     ]
 }