Merge "Make ConnectivityTestPreparer.apk path explicit" into main am: af139d7b7d

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

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