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

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

Change-Id: Ic262707ffb0f50a62c6adb550501e097e3b28ee9