Merge "Create a new test_module_config entries for TEST_MAPPING options" into main am: e3a5bb9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3250400



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