updated NOS/MEO apn names

As requested in https://jira.cyanogenmod.org/browse/CYAN-5480

Also: restored Vodafone apn fix made in 74033 and accidentally reverted
in 73922

Change-Id: I426f5dbbe6fd671c26367ce5265d58e0e7dd9f1a
diff --git a/prebuilt/common/etc/selective-spn-conf.xml b/prebuilt/common/etc/selective-spn-conf.xml
index 2e218b0..74d5400 100755
--- a/prebuilt/common/etc/selective-spn-conf.xml
+++ b/prebuilt/common/etc/selective-spn-conf.xml
@@ -1194,8 +1194,8 @@
   <spnOverride numeric="26010"  spn="Telefony Opalenickie" />
   <spnOverride numeric="26009"  spn="Telekomunikacja Kolejowa" />
   <!-- Portugal -->
-  <spnOverride numeric="26803"  spn="Optimus" />
-  <spnOverride numeric="26806"  spn="TMN" />
+  <spnOverride numeric="26806"  spn="MEO" />
+  <spnOverride numeric="26803"  spn="NOS" />
   <spnOverride numeric="26801"  spn="Vodafone" />
   <spnOverride numeric="26821"  spn="Zapp" />
   <!-- Puerto Rico -->