Make TMO IMS/MMS use ipv6 when roaming on IWLAN

They want ipv4 when roaming on mobile data, but v6 always on iwlan.
Make it so.

bug:26393001
Change-Id: Ic6f800bd4da9cb563b59588ba6062adcf83e8fe2
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 3e17a2f..6bbc30c 100755
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -9396,6 +9396,37 @@
       type="mms"
       protocol="IPV6"
       roaming_protocol="IP"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17"
+  />
+
+  <apn carrier="T-Mobile MMS"
+       mcc="310"
+       mnc="260"
+       apn="TMUS"
+       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+       type="mms"
+       protocol="IPV6"
+       roaming_protocol="IPV6"
+       bearer_bitmask="18"
+  />
+
+  <apn carrier="T-Mobile IMS"
+       mcc="310"
+       mnc="260"
+       apn="ims"
+       type="ims"
+       protocol="IPV6"
+       bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17"
+  />
+
+  <apn carrier="T-Mobile IMS"
+       mcc="310"
+       mnc="260"
+       apn="ims"
+       type="ims"
+       protocol="IPV6"
+       roaming_protocol="IPV6"
+       bearer_bitmask="18"
   />
 
   <apn carrier="Project Fi - T"
@@ -9423,14 +9454,6 @@
        mvno_type="IMSI"
   />
 
-  <apn carrier="T-Mobile IMS"
-      mcc="310"
-      mnc="260"
-      apn="ims"
-      type="ims"
-      protocol="IPV6"
-  />
-
   <apn carrier="MetroPCS 260"
       mcc="310"
       mnc="260"