Merge "[Multi-user] Change PackageManagerService to pass in userId to restoreAtInstall."