Merge "Actually make PackageManagerInternal things internal"