Update `.mailmap` (#7578)

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

Release Notes:

- N/A
1ba42f69eeMarshall Bowers committed on 2/8/2024, 5:08:37 PM· committed by GitHubparentb77d452
1 file changedLine totals unavailable