Merge "Use ConnectivityCheckTargetPreparer in CTS" am: defc74fb2f am: e453beefc5

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

Change-Id: Iabe5b0488223412afeb6674e499f450429a27dd4