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