Merge "Print correct version code when skipping outdated system packages" into pi-dev

am: bf22d134cc

Change-Id: I1fcd341b2e7f21c8f9f507fdd718ebf328a7367b

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

@@ -8770,7 +8770,7 @@ public class PackageManagerService extends IPackageManager.Stub
             // equal to the version on the /data partition. Throw an exception and use
             // the application already installed on the /data partition.
             throw new PackageManagerException(Log.WARN, "Package " + pkg.packageName + " at "
-                    + pkg.codePath + " ignored: updated version " + disabledPkgSetting.versionCode
+                    + pkg.codePath + " ignored: updated version " + pkgSetting.versionCode
                     + " better than this " + pkg.getLongVersionCode());
         }