Merge "Add StringDef annotation for SYSTEM_SETTINGS_WHITELIST"