Merge "Merge "[SettingsProvider] move getCallingPackage() outside of lock"...

Merge "Merge "[SettingsProvider] move getCallingPackage() outside of lock" into sc-dev am: c1baf3e1 am: 7d82cb14" into sc-v2-dev-plus-aosp am: 2cb0aab9

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

Change-Id: I3d987d4481a0325c846c792ab8c31387f4dcffed