Merge "[automerger skipped] Merge "Add test_mainline_modules to the auto-gen...
Merge "[automerger skipped] Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." into rvc-dev am: b676ead4 -s ours am: 3825ca69 -s ours" into rvc-d1-dev-plus-aosp