Overhaul O2 UK APNs

Per https://jira.cyanogenmod.org/browse/CYAN-2183 the previous ones
were all incorrect/broken and replaced by the new addition.

Needs testing

Change-Id: Ic6781e9d75da61f8ff2c84de13c3235ee97a029b