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