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

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/3363887

Change-Id: Ic4010ba3d70a80c154767910922d8791d6df1e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7193d26..40aac18 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -25,12 +25,7 @@
       "name": "hidl_test"
     },
     {
-       "name": "CtsOsTestCases",
-       "options": [
-           {
-              "include-filter": "android.os.cts.HwBinderTest"
-           }
-       ]
+      "name": "CtsOsTestCases_cts_hwbindertest"
     }
   ]
 }