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

* commit 'a2d258333b5a513258477ed6dd29e9494db600d0':
  Fix inability to make emergency call when call in progress on multi-sim.