Merge "Fix emergency call logic for DSDS in SIM2 slot only" into nyc-dev