[automerger skipped] Merge "Fix usage of the wrong lock in PackageManager...

[automerger skipped] Merge "Fix usage of the wrong lock in PackageManager (mLock instead of mSettings)" into rvc-qpr-dev am: 308b772c am: e3eb8abd -s ours

am skip reason: Change-Id Ie822d8f2267dcb8ce382e91ab5de365a4e0ce19f with SHA-1 1690689b is in history

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

Change-Id: Ie0b36349d035eb3cd421e567931fcc23e1204888