O2UK, APN compliance to OC requirement.

Test: make

Bug:38411286
Change-Id: I27349c5d695e5acf0ff4b4970293a1f223223ea6
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 5c43166..c2153f9 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -3410,7 +3410,7 @@
       type="mms"
   />
 
-  <apn carrier="O2 Mobile Web"
+  <apn carrier="O2 Pay Monthly"
       mcc="234"
       mnc="10"
       apn="mobile.o2.co.uk"
@@ -3422,7 +3422,7 @@
       type="default,hipri,supl,mms"
   />
 
-  <apn carrier="O2 Pay &amp; Go"
+  <apn carrier="O2 Pay As You Go"
       mcc="234"
       mnc="10"
       apn="payandgo.o2.co.uk"
@@ -3436,7 +3436,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="O2 Pay &amp; Go"
+  <apn carrier="O2 Pay As You Go"
       mcc="234"
       mnc="10"
       apn="payandgo.o2.co.uk"
@@ -3450,7 +3450,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="O2 Pay &amp; Go"
+  <apn carrier="O2 Pay As You Go"
       mcc="234"
       mnc="10"
       apn="payandgo.o2.co.uk"
@@ -3464,7 +3464,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="O2 Pay &amp; Go"
+  <apn carrier="O2 Pay As You Go"
       mcc="234"
       mnc="10"
       apn="payandgo.o2.co.uk"