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

Change-Id: Ib99ff2efeda8c5b74bea089be79b62d3077d7460