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

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

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