Merge "UserSystemPackageInstaller uses user types"