Merge "Show voicemail number as the default number for call forwarding" am: 77644dd6b8
am: 99c25432e9

Change-Id: I5f1b107cf9df960c0411f26facc5647f61d5832b