Merge "Correct mmsproxy and mmsport" am: 69d69822 am: 1f1216b1 am: f71ea546 am: 69df3eff

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: Ic01cb467676757d400f9f9e46b3cef37a17b3a4d

etc/apns-full-conf.xml

@@ -38607,8 +38607,8 @@
       apn="enhancedphone"
       type="default,ia,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
-      mmsc_proxy="proxy.mobile.att.net"
-      mmsc_proxy_port="80"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_editable="false"
@@ -38647,8 +38647,8 @@
       apn="nrphone"
       type="default,ia,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
-      mmsc_proxy="proxy.mobile.att.net"
-      mmsc_proxy_port="80"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_editable="false"