Merge "Add KeyChain Test API for the credential manager"