Merge "PackageManagerService lock reduction: address comments"