am bc92a28e: resolved conflicts for merge of d71914ed to jb-mr1-dev-plus-aosp

* commit 'bc92a28eb36b09326c0502bf2bc1665604183698':
  Add new APN values for a new operator (Hot Mobile) in Israel. Signed-off-by: tal <talkarliner7@gmail.com>
diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
index 3d35816..77d6aa7 100644
--- a/etc/apns-conf_verizon.xml
+++ b/etc/apns-conf_verizon.xml
@@ -46,6 +46,44 @@
         roaming_protocol="IPV4V6"
     />
 
+    <!-- VZW CDMA -->
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="6"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="7"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="8"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="12"
+    />
+
     <!-- Modify Apn database for VZW LTE support -->
     <apn carrier="LTE - Verizon Internet"
         mcc="311"