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

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

Change-Id: Ib7e26cc93eafbb2a79e1564f47b194d8a6dcb618