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

* commit '4f8dc822102a8b138d980cabff35ad3ac28ebb96':
  Fix merge after a conference call goes through SRVCC.