Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev