diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp
index e572e50..5ac84f1 100644
--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -275,387 +275,3 @@
     },
     auto_gen_config: true,
 }
-
-FLAKY_OR_IGNORED = [
-    "androidx.test.filters.FlakyTest",
-    "org.junit.Ignore",
-]
-
-test_module_config {
-    name: "FrameworksCoreTests_Presubmit",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_annotations: ["android.platform.test.annotations.Presubmit"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_inputmethod",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "com.android.internal.inputmethod",
-        "android.view.inputmethod",
-    ],
-    exclude_annotations: ["androidx.test.filters.FlakyTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_context",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.ContextTest"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_keyguard_manager",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.app.KeyguardManagerTest"],
-    exclude_annotations: [
-        "androidx.test.filters.FlakyTest",
-        "org.junit.Ignore",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_property_invalidated_cache",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.app.PropertyInvalidatedCacheTests"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_content",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "android.content.ContextTest",
-        "android.content.ComponentCallbacksControllerTest",
-        "android.content.ContextWrapperTest",
-    ],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_sqlite",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.database.sqlite.SQLiteRawStatementTest"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_net",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.net"],
-    include_annotations: ["android.platform.test.annotations.Presubmit"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_battery_stats",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.os.BatteryStatsTests"],
-    exclude_annotations: ["com.android.internal.os.SkipPresubmit"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_environment",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.os.EnvironmentTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_util_data_charset",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "com.android.internal.util.FastDataTest",
-        "android.util.CharsetUtilsTest",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_xml",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "android.util.XmlTest",
-        "android.util.BinaryXmlTest",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_util_apk",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.util.apk.SourceStampVerifierTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_textclassifier",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.view.textclassifier"],
-    exclude_annotations: ["androidx.test.filters.FlakyTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_app",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.app."],
-    exclude_filters: [
-        "com.android.internal.app.WindowDecorActionBarTest",
-        "com.android.internal.app.IntentForwarderActivityTest",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_content",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.content."],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_infra",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.infra."],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_jank",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.jank"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_os_binder",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.os.BinderDeathDispatcherTest"],
-    exclude_annotations: ["com.android.internal.os.SkipPresubmit"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_os_kernel",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "com.android.internal.os.KernelCpuUidClusterTimeReaderTest",
-        "com.android.internal.os.KernelCpuUidBpfMapReaderTest",
-        "com.android.internal.os.KernelCpuUidActiveTimeReaderTest",
-        "com.android.internal.os.KernelCpuUidFreqTimeReaderTest",
-        "com.android.internal.os.KernelSingleUidTimeReaderTest",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_server_power",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.server.power.stats.BstatsCpuTimesValidationTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_security",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.security."],
-    include_annotations: ["android.platform.test.annotations.Presubmit"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_internal_util_latency_tracker",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.util.LatencyTrackerTest"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_content_capture_options",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.ContentCaptureOptionsTest"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_content_integrity",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.integrity."],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_content_pm_PreSubmit",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.pm."],
-    include_annotations: ["android.platform.test.annotations.Presubmit"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_content_pm_PostSubmit",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.pm."],
-    include_annotations: ["android.platform.test.annotations.Postsubmit"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_content_res",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.res."],
-    include_annotations: ["android.platform.test.annotations.Presubmit"],
-    exclude_annotations: [
-        "androidx.test.filters.FlakyTest",
-        "android.platform.test.annotations.Postsubmit",
-        "org.junit.Ignore",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_content_res_PostSubmit",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.content.res."],
-    include_annotations: ["android.platform.test.annotations.Postsubmit"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_service",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "android.service.euicc",
-        "android.service.notification",
-        "android.service.quicksettings",
-        "android.service.settings.suggestions",
-        "android.service.controls.templates",
-        "android.service.controls.actions",
-        "android.service.controls",
-    ],
-    exclude_annotations: ["org.junit.Ignore"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_view_contentcapture",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.view.contentcapture"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_android_view_contentprotection",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.view.contentprotection"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_com_android_internal_content_Presubmit",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.content."],
-    include_annotations: ["android.platform.test.annotations.Presubmit"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_drawable",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.graphics.drawable.IconTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_accessibility_NO_FLAKES",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "com.android.internal.accessibility",
-        "android.accessibilityservice",
-        "android.view.accessibility",
-    ],
-    exclude_annotations: ["androidx.test.filters.FlakyTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "com.android.internal.accessibility",
-        "android.accessibilityservice",
-        "android.view.accessibility",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_usage",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.app.usage"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_fastdata",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["com.android.internal.util.FastDataTest"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_hardware_input",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: ["android.hardware.input"],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_view_verified",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "android.view.VerifiedMotionEventTest",
-        "android.view.VerifiedKeyEventTest",
-    ],
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_jank",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_filters: [
-        "com.android.internal.jank.FrameTrackerTest",
-        "com.android.internal.jank.InteractionJankMonitorTest",
-        "com.android.internal.util.LatencyTrackerTest",
-    ],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}
-
-test_module_config {
-    name: "FrameworksCoreTests_Platinum",
-    base: "FrameworksCoreTests",
-    test_suites: ["general-tests"],
-    include_annotations: ["android.platform.test.annotations.PlatinumTest"],
-    exclude_annotations: FLAKY_OR_IGNORED,
-}