Merge "ConnectivityCoverageTests refactoring" am: 1ae9c4ad07

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

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