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

Change-Id: I4bf5d34d3000862a2b79186f2f2aaadca0825bfa