Merge "Add more methods that take a userId to PackageManager."