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

Change-Id: Ib6da0d07afe6a82e448aaa439663011e350a2aa3