am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev

* commit '6dd856b1ea31bae083b6c2ed40af812c41b3a6cf':
  Don't drop runtime permissions on older system app update.

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -5933,12 +5933,6 @@ public class PackageManagerService extends IPackageManager.Stub {
          */
         if (shouldHideSystemApp) {
             synchronized (mPackages) {
-                /*
-                 * We have to grant systems permissions before we hide, because
-                 * grantPermissions will assume the package update is trying to
-                 * expand its permissions.
-                 */
-                grantPermissionsLPw(pkg, true, pkg.packageName);
                 mSettings.disableSystemPackageLPw(pkg.packageName);
             }
         }