Merge "Fix merge after a conference call goes through SRVCC." into mm-wireless-dev
am: 1d3879b

* commit '1d3879b00a5135802abaf9187d99577745d41c49':
  Fix merge after a conference call goes through SRVCC.