SettingsProvider.apk: diff to x138