Merge "Check Phone\'s ServiceState to see if it accepts Emergency Calls" into nyc-dev am: 707f5e8
am: bc6017c

* commit 'bc6017cce25fcbec49008c7a90e66a208664f6b6':

Change-Id: I8c7a003d6bf5289266ec21352062299a2f731fcc