Merge "Disable voicemail number setting according to carrier config"
am: 7289985f35

Change-Id: Ibb5a66bc3e022914cab216e84d4da9334f278bd3