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

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