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

Change-Id: Ifa95080dff3a1a83f454fa0623e3ac2487d8b8a0