Merge "Fix inability to make emergency call when call in progress on multi-sim." into nyc-dev