Merge "CarrierConfig: fix giffgaff voicemail number" into oc-mr1-dev