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

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

Change-Id: I3ecfafdc9ae09bc8ac6c707a70f488d852a071cc