Merge "Update api-lint baseline for NO_SETTINGS_PROVIDER"