Update `.mailmap` (#7578)

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

Release Notes:

- N/A

Marshall Bowers committed 2y ago

1ba42f69ee5559a23cd8fd3a5ae6b0cdb128fde4

Parent: b77d452

Committed by GitHub <noreply@github.com> on 2/8/2024, 5:08:37 PM