Merge "Extend carrier configs for visual voicemail"
am: f4db619b0b

Change-Id: I0ae8f81fde3ca866c6be897311243b6225341296