Merge "Use ConnectivityCheckTargetPreparer in CTS" am: defc74fb2f

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

Change-Id: If029b7cb4c7486673c6808f1b6d8a15b67ea0e04