Merge changes Iabebe9cf,I5afbd60f into qt-dev

* changes:
  Automatically run Package Installer tests
  Remove support to install apps from a file

packages/PackageInstaller/TEST_MAPPING

@@ -0,0 +1,24 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsPackageInstallTestCases",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.AppModeInstant"
+        }
+      ]
+    },
+    {
+      "name": "CtsNoPermissionTestCases"
+    },
+    {
+      "name": "CtsNoPermissionTestCases25"
+    },
+    {
+      "name": "CtsPackageInstallerTapjackingTestCases"
+    },
+    {
+      "name": "CtsPackageUninstallTestCases"
+    }
+  ]
+}

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

@@ -109,8 +109,8 @@ public class InstallStart extends Activity {
         } else {
             Uri packageUri = intent.getData();
 
-            if (packageUri != null && (packageUri.getScheme().equals(ContentResolver.SCHEME_FILE)
+            if (packageUri != null && packageUri.getScheme().equals(
-                    || packageUri.getScheme().equals(ContentResolver.SCHEME_CONTENT))) {
+                    ContentResolver.SCHEME_CONTENT)) {
                 // [IMPORTANT] This path is deprecated, but should still work. Only necessary
                 // features should be added.