Merge "[SettingsProvider] move getCallingPackage() outside of lock" into sc-dev am: c1baf3e1 am: b8c3d019

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

Change-Id: I003c908aa29a8c614ed1cd8b397b735a81ff9b6f