Merge "Revert "Adding fuzz_service_test to run at presubmit"" am: ef4b11c23d am: 7a4134f308 am: dc19c566f5 am: 5a79a9895a am: 5701e63164 am: 5a2984685c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2603915

Change-Id: Ifb295e57f1445309d3c87b7f9b5d1c7c564908a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/TEST_MAPPING b/libs/binder/TEST_MAPPING
index 2b3ff44..199574e 100644
--- a/libs/binder/TEST_MAPPING
+++ b/libs/binder/TEST_MAPPING
@@ -64,9 +64,6 @@
       "name": "libbinderthreadstateutils_test"
     },
     {
-      "name": "fuzz_service_test"
-    },
-    {
       "name": "CtsOsTestCases",
       "options": [
         {
diff --git a/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp b/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
index 7b59287..e60ca22 100644
--- a/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
+++ b/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
@@ -52,5 +52,4 @@
     required: [
         "test_service_fuzzer_should_crash",
     ],
-    test_suites: ["general-tests"],
 }