Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." am: 1d9e2364 am: 30a6edb9 Change-Id: I2134c97ff74f278033887a0e9ea5f758f4080772