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

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

Change-Id: Iedb4b10d8bf46aa30d54022044c417d35a31d40e