Merge "[SettingsProvider] lint checks for non-user getter calls from system server"