Merge "Extend carrier configs for visual voicemail" am: f4db619b0b am: e701b7ab34 am: a8e971b75c  -s ours
am: 75c534ae15  -s ours

Change-Id: I75443804788d24794baa1aca64343f5d0627d702