Merge "Make ConnectivityTestPreparer.apk path explicit" into main