[automerger skipped] Merge "Add missing synchronized(mLock) blocks into PackageManagerService" into rvc-qpr-dev am: 83462e4f am: 3c117830 -s ours

am skip reason: Change-Id Icefabfc9bb8c028edca6f5550524ea7dc1b6ffd9 with SHA-1 648b2c0e is in history

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

Change-Id: I13a1504c54e4851885dde817cd326fafac086ed5