The error that this patch was guarding against is no longer reproducible
on d2spr.
This reverts commit 285d4c2a4d.
Change-Id: I373ad22a021de74df4f8907dc79717719708431d
<apncarrier="LTE - Test Internet"mcc="001"mnc="01"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="14"/>
<apncarrier="LTE - Test Internet"mcc="001"mnc="01"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14"/>
<apncarrier="LTE - Test FOTA"mcc="001"mnc="01"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - Test IMS"mcc="001"mnc="01"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - Test CBS"mcc="001"mnc="01"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test Internet"mcc="001"mnc="010"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="14"/>
<apncarrier="LTE - VZW Test Internet"mcc="001"mnc="010"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14"/>
<apncarrier="LTE - VZW Test FOTA"mcc="001"mnc="010"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test IMS"mcc="001"mnc="010"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test CBS"mcc="001"mnc="010"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test Internet"mcc="246"mnc="81"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="14"/>
<apncarrier="LTE - VZW Test Internet"mcc="246"mnc="81"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14"/>
<apncarrier="LTE - VZW Test FOTA"mcc="246"mnc="81"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test IMS"mcc="246"mnc="81"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test CBS"mcc="246"mnc="81"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test Internet"mcc="246"mnc="081"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="14"/>
<apncarrier="LTE - VZW Test Internet"mcc="246"mnc="081"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="14"/>
<apncarrier="LTE - VZW Test FOTA"mcc="246"mnc="081"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test IMS"mcc="246"mnc="081"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<apncarrier="LTE - VZW Test CBS"mcc="246"mnc="081"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="14"/>
<!-- END modify Apn database for VZW LTE support -->
<!-- Modify Apn database for VZW EHRPD support -->
<apncarrier="EHRPD - Test Internet"mcc="001"mnc="01"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="13"/>
<apncarrier="EHRPD - Test Internet"mcc="001"mnc="01"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13"/>
<apncarrier="EHRPD - Test FOTA"mcc="001"mnc="01"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - Test IMS"mcc="001"mnc="01"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - Test CBS"mcc="001"mnc="01"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test Internet"mcc="001"mnc="010"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="13"/>
<apncarrier="EHRPD - VZW Test Internet"mcc="001"mnc="010"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13"/>
<apncarrier="EHRPD - VZW Test FOTA"mcc="001"mnc="010"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test IMS"mcc="001"mnc="010"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test CBS"mcc="001"mnc="010"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test Internet"mcc="246"mnc="81"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="13"/>
<apncarrier="EHRPD - VZW Test Internet"mcc="246"mnc="81"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13"/>
<apncarrier="EHRPD - VZW Test FOTA"mcc="246"mnc="81"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test IMS"mcc="246"mnc="81"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test CBS"mcc="246"mnc="81"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test Internet"mcc="246"mnc="081"apn="VZWINTERNET"type="default,dun"protocol="IP" roaming_protocol="IP" bearer="13"/>
<apncarrier="EHRPD - VZW Test Internet"mcc="246"mnc="081"apn="VZWINTERNET"type="default,dun"protocol="IPV4V6" roaming_protocol="IPV4V6" bearer="13"/>
<apncarrier="EHRPD - VZW Test FOTA"mcc="246"mnc="081"apn="VZWADMIN"type="fota"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test IMS"mcc="246"mnc="081"apn="VZWIMS"type="ims"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>
<apncarrier="EHRPD - VZW Test CBS"mcc="246"mnc="081"apn="VZWAPP"type="cbs,mms"mmsc="http://mms.vtext.com/servlets/mms"protocol="IPV4V6"roaming_protocol="IPV4V6"bearer="13"/>