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

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

Change-Id: Ic4aeb19248ff5086e7027eb1cb0386dae2c7b671