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

Change-Id: I8b24f943f6146db45dec8ef23e345570e1f1d23e