Merge "Inject more dependencies into PackageManagerService"