Merge "Refactor EmergencyCallHelper to better handle DSDS" into nyc-mr1-dev