Update `.mailmap` (#13219)

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

Release Notes:

- N/A

Marshall Bowers committed 2y ago

39edbe1c5013a2181d6f1f83fe95a1fd6cd97973

Parent: f6fa660

Committed by GitHub <noreply@github.com> on 6/18/2024, 5:20:50 PM