Merge "Fix inconsistent getPackageInfo() calls when parsing exceptions."