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

Change-Id: I07fb33c45bd3fc81ba6f9af91a77825867b906b8