Merge "[SettingsProvider] add missing @FlaggedAPI annotations" into main