Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages"