Merge "Selecting Phone Contact for Voicemail number" am: 465d47a963
am: 72d6430af6

Change-Id: I0fc7e89b2a888547d678ae7e2cef5b7f633d5a2f