Merge "Fix usage of the wrong lock in PackageManager (mLock instead of mSettings)" into rvc-qpr-dev am: 308b772c1f

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

Change-Id: I3417ab8ea9f22e7caaf683f4eeaf94505628527d