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

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

Change-Id: If985d85204ebf96945c66ccbd8789484bc71cf3b