Merge "Handle IllegalStateExceptions possible from EmergencyNumber APIs." am: 89be4ceffe am: e59b042094 am: de54ec5be9

Change-Id: I7604a49708057ffd5e48ad0a9fe2be346ca83847