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

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>