Merge "Fix bug in isVoicemailNumber method not returning early"
am: 59c58249e8

Change-Id: Ia942ba5835fc01cf281a8c5ac32cda92650537d7