Change to use CBS apn for mms.

bug:4974038
Change-Id: I153bc478635a5699f5b64db40e8436d6b95b7715
diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
index 173164d..d73be47 100644
--- a/etc/apns-conf_verizon.xml
+++ b/etc/apns-conf_verizon.xml
@@ -16,8 +16,7 @@
         mcc="310"
         mnc="004"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -41,7 +40,8 @@
         mcc="310"
         mnc="004"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -51,8 +51,7 @@
         mcc="311"
         mnc="480"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -76,7 +75,8 @@
         mcc="311"
         mnc="480"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -84,8 +84,7 @@
         mcc="204"
         mnc="04"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -109,7 +108,8 @@
         mcc="204"
         mnc="04"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -117,8 +117,7 @@
         mcc="001"
         mnc="01"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -142,7 +141,8 @@
         mcc="001"
         mnc="01"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -150,8 +150,7 @@
         mcc="001"
         mnc="010"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -175,7 +174,8 @@
         mcc="001"
         mnc="010"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="hhtp://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -183,8 +183,7 @@
         mcc="246"
         mnc="81"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://mms.vtext.com/servlets/mms"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -208,7 +207,8 @@
         mcc="246"
         mnc="81"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -216,8 +216,7 @@
         mcc="246"
         mnc="081"
         apn="VZWINTERNET"
-        mmsc="http://mms.vtext.com/servlets/mms"
-        type="default,mms,dun"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -241,7 +240,8 @@
         mcc="246"
         mnc="081"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
diff --git a/etc/test-apns-conf_verizon.xml b/etc/test-apns-conf_verizon.xml
index d7c940f..3315f04 100644
--- a/etc/test-apns-conf_verizon.xml
+++ b/etc/test-apns-conf_verizon.xml
@@ -18,10 +18,7 @@
         mcc="310"
         mnc="004"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -45,7 +42,10 @@
         mcc="310"
         mnc="004"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -55,10 +55,7 @@
         mcc="311"
         mnc="480"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -82,7 +79,10 @@
         mcc="311"
         mnc="480"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -90,10 +90,7 @@
         mcc="204"
         mnc="04"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -117,7 +114,10 @@
         mcc="204"
         mnc="04"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -125,10 +125,7 @@
         mcc="001"
         mnc="01"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -152,7 +149,10 @@
         mcc="001"
         mnc="01"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -160,10 +160,7 @@
         mcc="001"
         mnc="010"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -187,7 +184,10 @@
         mcc="001"
         mnc="010"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -195,10 +195,7 @@
         mcc="246"
         mnc="81"
         apn="VZWINTERNET"
-        type="default,mms,dun"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -222,7 +219,10 @@
         mcc="246"
         mnc="81"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -230,10 +230,7 @@
         mcc="246"
         mnc="081"
         apn="VZWINTERNET"
-        mmsc="http://vzpix.com/servlets/mms"
-        user="hrltest@vztest.com"
-        password="vzwtest"
-        type="default,mms,dun"
+        type="default,dun"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />
@@ -257,7 +254,10 @@
         mcc="246"
         mnc="081"
         apn="VZWAPP"
-        type="cbs"
+        type="cbs,mms"
+        mmsc="http://vzpix.com/servlets/mms"
+        user="hrltest@vztest.com"
+        password="vzwtest"
         protocol="IPV4V6"
         roaming_protocol="IPV4V6"
     />