Fix conflict in PackageManagerService.java