Update `.mailmap` (#7871)

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

Release Notes:

- N/A
6869b62af3Marshall Bowers committed on 2/15/2024, 11:35:43 PM· committed by GitHubparent21a7421
1 file changedLine totals unavailable