Merge "Batch creation of test_module_config entries in frameworks/base" into main am: 2e1a903f24 am: a62826e6f7

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

Change-Id: I4bab2927281efc018de8af42e913fea71c48ded7
Signed-off-by: Automerger Merge Worker <[email protected]>