AI 150122: Merge from donut.
  Fix permissions issue for uninstall of updated system applications.
  If an existing update for a system application is uninstalled, when reverting back to the existing
  version in system partition, permissions have to be granted again.
  BUG=1893639

Automated import of CL 150122
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 1f3ec2b..00c80f0 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -4034,6 +4034,7 @@
             return false;
         }
         synchronized (mPackages) {
+            grantPermissionsLP(newPkg, true);
             mSettings.writeLP();
         }
         return true;