Merge "Fix kotlin nullable errors in CredentialManager" into udc-dev-plus-aosp