Stop hardcoding carrier for some regions (bug 1061716)

https://bugzilla.mozilla.org/show_bug.cgi?id=1061716

This was introduced in 2f67a82 to be more more DRY, but it was wrong in some cases: for instance, it meant your carrier was automatically set to 'deutsche_telekom' if you had an US SIM.

Also took the time to sort the 2 arrays by MCC.
2 (and 10, 11) is definitely `telefonica`. The MNC should be 234 though, fixing that.
30 is also definitely DT, and the MNC is ok - 235.

Vodafone should not be considered as DT AFAIK so we shouldn't add 15 and 30.