android.provider.Settings: fix conflict mistake