Merge "Don't drop runtime permissions on older system app update." into mnc-dev

         */

        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);

            }

        }