Change TEST_MAPPING to use test_module_config rather than list options. am: 5cd08b169e

Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/3364257

Change-Id: Ic3310d19b7e74c5ca416bc33c2a4dacb2b09404a
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 07320c9..e56bb83 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,20 +4,10 @@
       "name": "libbinderthreadstateutils_test"
     },
     {
-      "name": "SettingsGoogleUnitTests",
-      "options": [
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
+      "name": "SettingsGoogleUnitTests"
     },
     {
-       "name": "CtsOsTestCases",
-       "options": [
-           {
-              "include-filter": "android.os.cts.HwBinderTest"
-           }
-       ]
+      "name": "CtsOsTestCases_cts_hwbindertest"
     }
   ]
 }