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

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

Change-Id: I6c1e9068099a361d41619b8f0c2a119908204fdc