Merge "Remove DefaultContainerService usage in PackageManagerService."