Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I392f851936d230fff2d84e65d9262454fc2e05ab
Change-Id: If20dbe6e13048308bb918dae1363b3b09815f8f7
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index b9d5ebe..6121c38 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Runs BlockedNumberProvider Test Cases.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="BlockedNumberProviderTest.apk" />
     </target_preparer>