Merge "Change TEST_MAPPING to use test_module_config rather than list options." into main am: 6a3fdbb

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

Change-Id: I46b97f36e6d7e83fce0070d9d0051ea93ac3a595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Treehugger Robot

libs/binder/TEST_MAPPING

@@ -67,15 +67,7 @@
       "name": "fuzz_service_test"
     },
     {
-      "name": "CtsOsTestCases",
-      "options": [
-        {
-          "include-filter": "android.os.cts.BinderTest"
-        },
-        {
-          "include-filter": "android.os.cts.ParcelTest"
-        }
-      ]
+      "name": "CtsOsTestCases_ParcelAndBinderTests"
     },
     {
       "name": "libbinder_rs-internal_test"