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