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

Change-Id: I292dd85b1a758c728ee522c26ed3348897938306