Merge QP1A.190530.001

Change-Id: I5e873e15b1304b9dd0e1d4ec96e1e49b31aa967c

tests/Android.bp

@@ -94,7 +94,7 @@ java_test_host {
 
     srcs:  ["src/**/ApexTargetPrepTest.java"],
 
-    data: [":apex.test"],
+    data: [":StagedInstallTestApexV2"],
 
     test_config: "apex-targetprep-tests.xml",
 

tests/apex-targetprep-tests.xml

@@ -19,7 +19,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
     <target_preparer class="com.android.tradefed.targetprep.InstallApexModuleTargetPreparer" >
-         <option name="test-file-name" value="apex.test.apex" />
+         <option name="test-file-name" value="com.android.apex.cts.shim.v2.apex" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.HostTest" >
          <option name="jar" value="apex_targetprep_tests.jar" />

tests/testdata/AndroidManifest.xml

@@ -3,6 +3,5 @@
   package="com.android.apex.test">
   <!-- APEX does not have classes.dex -->
   <application android:hasCode="false" />
-  <uses-sdk android:minSdkVersion="28"/>
 </manifest>