Update `.mailmap` (#13219)

This PR updates the `.mailmap` file to merge some commit authors using
multiple emails.

Release Notes:

- N/A
39edbe1c50Marshall Bowers committed on 6/18/2024, 5:20:50 PM· committed by GitHubparentf6fa660
1 file changedLine totals unavailable