Merge "ConnectivityCoverageTests refactoring" am: 1ae9c4ad07 am: 81c2c54a82 am: 601aaf7d4c

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

Change-Id: If3d77f57409a45a2bcde1ee220d2b6806edb1979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>