Merge "Changed UriGrantsManagerService so it lazy-loads PackageManageInternal."