Merge "ConnectivityCoverageTests refactoring" am: 1ae9c4ad07

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

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