Merge "[pm] Fix missing locks in PackageManagerService" into tm-dev