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

Change-Id: I835e76144e458d48b4fe1e7f6e944600fa95792a