Merge "Update ConnectivityCheckTargetPreparer references" am: 05c7676acd

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

Change-Id: I079079ad0c48b2582d38524bb193971987b85801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>