Merge "Correct locking in PackageManagerService" into sc-dev