Merge "Revert "Revert "[SettingsProvider] remove in-lock calls to PackageManager.getPackageUid()""" into sc-dev