Merge "Fix PackageSetInstallerTest for multi-user"