Snap for 9453251 from 3ae2304d4fc844f175df5e6952b7636a36187073 to mainline-wifi-release

Change-Id: I0e93b98b7de43f1d7448906e73bc1bc355be5d7c
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 41334d5..60e9a01 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -26,7 +26,7 @@
         hence we cannot rely on "test-file-name" to install LatinIME.apk
     -->
 
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="LatinIMETests.apk" />
     </target_preparer>