Merge "Add PackageManagerInternal mock to prevent NPE"