Merge "Fix the issue that SettingsProvider sees mismatched calling uid and pkg"