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

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

Change-Id: Idf16454383a65e6ccc1c4672c7d83e8742512ea7