Merge \\"Refactor EmergencyCallHelper to better handle DSDS\\" into nyc-mr1-dev am: 0a6f39747d
am: c2a70e3cf7

Change-Id: I8d114e85867c2f68cdf50cc4bd23883b5b3e0833