Snap for 9417785 from 9beddd9c0092372680c5a58f878fbb95e03acc6f to mainline-mediaprovider-release

Change-Id: I8d6060fabf9ccf525249456dd32807bbd7d0eee4
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 83b287a..7f46b53 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Runs Tests for MtpService with the UI for output.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="MtpServiceTests.apk" />
     </target_preparer>