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

* commit '7b27b240901a9ab3236827dc7377e809284ca3b0':
  Fix merge after a conference call goes through SRVCC.