Merge "Disable voicemail number setting according to carrier config" am: 7289985f35 am: 3fb01a24e2
am: d2d64ab6f4  -s ours

Change-Id: I577dd0d658f998069cf3a0687ac77a16258f6320