Update Vodafone APN settings in the UK.

For bug 3163690.

Re-arrange the order of Vadafone apns and put the one
with mmsproxy first.

Change-Id: I0b72847fb8c357cf27cbccd456ab197f47f42d20
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index df8fcb8..9049625 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1145,13 +1145,16 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Post-pay ISP"
+  <apn carrier="Vodafone UK"
       mcc="234"
       mnc="15"
-      apn="internet"
-      user="web"
-      password="web"
-      type="default,supl"
+      apn="wap.vodafone.co.uk"
+      user="wap"
+      password="wap"
+      mmsc="http://mms.vodafone.co.uk/servlets/mms"
+      mmsproxy="212.183.137.12"
+      mmsport="8799"
+      type="default,supl,mms"
   />
 
   <apn carrier="Vodafone Prepay"
@@ -1166,16 +1169,13 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Vodafone UK"
+  <apn carrier="Vodafone Post-pay ISP"
       mcc="234"
       mnc="15"
-      apn="wap.vodafone.co.uk"
-      user="wap"
-      password="wap"
-      mmsc="http://mms.vodafone.co.uk/servlets/mms"
-      mmsproxy="212.183.137.12"
-      mmsport="8799"
-      type="default,supl,mms"
+      apn="internet"
+      user="web"
+      password="web"
+      type="default,supl"
   />
 
   <apn carrier="3 UK"