Migrate FrameworksServicesTests options to Android.bp

Test: atest

Ran these commands (one per TEST_MAPPING file) with this change and on
main and compared results of test counts by module.

	atest -p apex/jobscheduler/service/java/com/android/server/job:presubmit --collect-tests-only > apex_jobscheduler_service_java_com_android_server_job_presubmit.new
	atest -p apex/jobscheduler/service/java/com/android/server/usage:presubmit --collect-tests-only > apex_jobscheduler_service_java_com_android_server_usage_presubmit.new
	atest -p core/java/android/app:presubmit --collect-tests-only > core_java_android_app_presubmit.new
	atest -p core/java/android/os:presubmit --collect-tests-only > core_java_android_os_presubmit.new
	atest -p core/java/com/android/internal/os:presubmit --collect-tests-only > core_java_com_android_internal_os_presubmit.new
	atest -p services/accessibility:presubmit --collect-tests-only > services_accessibility_presubmit.new
	atest -p services/core/java/com/android/server/am:presubmit --collect-tests-only > services_core_java_com_android_server_am_presubmit.new
	atest -p services/core/java/com/android/server/appop:presubmit --collect-tests-only > services_core_java_com_android_server_appop_presubmit.new
	atest -p services/core/java/com/android/server/audio:presubmit --collect-tests-only > services_core_java_com_android_server_audio_presubmit.new
	atest -p services/core/java/com/android/server/compat:presubmit --collect-tests-only > services_core_java_com_android_server_compat_presubmit.new
	...

Bug: b/344977340
Test-Mapping-Slo-Bypass-Bug: b/335015078
Change-Id: If13cb122dc263b2ec37fa63160f6bac35a13d853

2 files changed, 2 insertions, 11 deletions

diff --git a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING
index e82df1203137..36b6c80eebe3 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING
+++ b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING
@@ -16,12 +16,7 @@
             ]
         },
         {
-            "name": "FrameworksServicesTests",
-            "options": [
-                {"include-filter": "com.android.server.job"},
-                {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-                {"exclude-annotation": "androidx.test.filters.LargeTest"}
-            ]
+            "name": "FrameworksServicesTests_com_android_server_job_Presubmit"
         }
     ],
     "postsubmit": [
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
index a75415ec6151..52670a2570d3 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
+++ b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING
@@ -17,11 +17,7 @@
       ]
     },
     {
-      "name": "FrameworksServicesTests",
-      "options": [
-        {"include-filter": "com.android.server.usage"},
-        {"exclude-annotation": "androidx.test.filters.FlakyTest"}
-      ]
+      "name": "FrameworksServicesTests_com_android_server_usage_Presubmit"
     }
   ],
   "postsubmit": [