Merge "Fix usage of the wrong lock in PackageManager (mLock instead of mSettings)"