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

Change-Id: I9718013c4ecc76129de4cba3f0ecc77558912755