Merge "Cleanup and refine connectivity test config" am: 3035f6c554

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

Change-Id: I49671b5d47c4e7aea56ade1dcd150ef55ac4b10f