internal/gophers: move Filippo's Gerrit email back to being first

mergeIDs makes the assumption that the first email seen for a
gopher is the one used for Gerrit. In the last update to gophers.go,
the first email for Filippo was changed to be invalid, causing
errors when automatic assignment was attempted in gopherbot.

Update golang/go#31919

Change-Id: Ief9115d1aed8ab998e92cfed792444d1a6463df8
Reviewed-on: https://go-review.googlesource.com/c/build/+/176037
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

internal/gophers/gophers.go

@@ -1000,10 +1000,9 @@ func init() {
 	addPerson("Filip Haglund", "drathier@users.noreply.github.com")
 	addPerson("Filip Ochnik", "filip.ochnik@gmail.com")
 	addPerson("Filip Stanis", "fstanis@google.com")
-	addPerson("Filippo Valsorda", "", "6195@62eb7196-b449-3ce5-99f1-c037f21e1705")
-	addPerson("Filippo Valsorda", "filippo@cloudflare.com")
 	addPerson("Filippo Valsorda", "filippo@golang.org", "11715@62eb7196-b449-3ce5-99f1-c037f21e1705")
-	addPerson("Filippo Valsorda", "filippo@golang.org", "hi@filippo.io", "@FiloSottile")
+	addPerson("Filippo Valsorda", "hi@filippo.io", "@FiloSottile", "filippo@cloudflare.com")
+	addPerson("Filippo Valsorda", "6195@62eb7196-b449-3ce5-99f1-c037f21e1705")
 	addPerson("Firmansyah Adiputra", "frm.adiputra@gmail.com", "@frm-adiputra")
 	addPerson("Florian Forster", "octo@google.com", "@octo")
 	addPerson("Florian Uekermann", "florian@uekermann.me", "13410@62eb7196-b449-3ce5-99f1-c037f21e1705")