Merge "Fix issue where unknown numbers crash Telephony."
am: 789eaac21f

Change-Id: Iaad810b5948cd9966fecc8cdf4942c6f0f855667