Fix Giffgaff APN

Per https://jira.cyanogenmod.org/browse/CYAN-3035

Change-Id: I6b5109849ec021877d79356eeb5b579a1b5b5bc6
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0