Merge "Fix setInstallerPackageName for secondary users."