Merge "Remove scrub event test from mainline presubmit" into main

1 files changed, 4 insertions, 0 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING
index b13021843..12fb1395c 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING
+++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING
@@ -73,6 +73,10 @@
                 {
                     "exclude-filter": "android.hibernation.cts.AutoRevokeTest#testUnusedApp_uninstallApp"
                 },
+                // TODO(b/280519694): This test is very flaky on T+ builds
+                {
+                    "exclude-filter": "android.hibernation.cts.AutoRevokeTest#testPermissionEventCleanupService_scrubsEvents"
+                },
                 {
                     "exclude-annotation": "android.platform.test.annotations.FlakyTest"
                 }