Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest...
Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." into rvc-dev am: b676ead4 am: 209c9950
Change-Id: Ic83242b8bcdd95147b36f93361d16024514b5bca