Merge "[Autofill CredMan]: Autofill changes for CredMan integration"