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