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

Change-Id: Id7495f7f869f3eb94b297147d37469edbfcbb9ea