Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev