Merge "Use ConnectivityCheckTargetPreparer in CTS" am: defc74fb2f am: e453beefc5 am: 03b6907523 am: 2a731f7cda

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

Change-Id: I0be9980ec930917e8bb434992e18fa0c0ba97cb8