Merge "Passes Injector into PackageManagerService ctor"