Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: I4078001620ed09d485d98c58dd8e178520773db0