Merge "Correct locking in PackageManagerService" into sc-dev am: 1a32fc6b5a am: e0325a7afe

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

Change-Id: I8afd257f2412fd7d91c1232aed887b72fb3903da