Merge "Remove some read only usages of PackageManagerService mLock"