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

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

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