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

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

am skip reason: Merged-In I9612c22839e62125db9ea42e081f4813d8591e55 with SHA-1 93dcd1f1 is already in history

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



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