Stop hardcoding carrier for some regions (bug 1061716)

This is actually a revert of 2f67a828, which was more DRY, but
wrong in some cases since it meant your carrier was automatically
set to 'deutsche_telekom' if you had an US SIM, for instance.

Also took the time to sort the 2 arrays by MCC.