[automerger skipped] Merge "[pm] Fix missing locks in PackageManagerService"...

[automerger skipped] Merge "[pm] Fix missing locks in PackageManagerService" into tm-dev am: 4fbbac24 am: 1e3b8fd6 am: dc562ec7 -s ours

am skip reason: Merged-In I9612c22839e62125db9ea42e081f4813d8591e55 with SHA-1 469ae062 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699337



Change-Id: Id1ba80bd613be6c34906ee8ebc6629a7b6add94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>