Merge "Change Giffgaff dual APN to more commonly used single APN" into gingerbread