Merge "Do not depend on all of NetworkStack in CTS" am: 119b539b25

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

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