Merge "Add support for network identified emergency calls." am: 108349f8d6
am: 6d400c7352

Change-Id: Ieee230cf4a506f3489700c1f499392f1b4659ed2