Snap for 9453251 from fe36c4e3bfe66849ee3b1370afe170c0acdb657a to mainline-wifi-release

Change-Id: Ib456a69c001c922fa35f50798be44dd8f3222446
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index e7d5d1a..d4fbd4d 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Run calendar provider tests.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="CalendarProviderTests.apk" />
     </target_preparer>