Merge "Handle IllegalStateExceptions possible from EmergencyNumber APIs." into rvc-dev am: e77f58ee71

Change-Id: Ibf8a838d9226dfacc82986787bace0b8c52878d8