[automerger skipped] Move test_mainline_modules to AndroidTest.xml am: fb34c5861a am: e32bc089be -s ours

am skip reason: Merged-In Ie0aca0c64646825175769cd375bcecf65de4b4c8 with SHA-1 fb34c5861a is already in history

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

Change-Id: Ibdcc7506d26489cd8cded5e578709d93bf3b83dd