Merge "ConnectivityCoverageTests refactoring" am: 1ae9c4ad07 am: 3134ed2b19

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

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