Merge "Batch creation of test_module_config entries in frameworks/base" into main