Merge "Ims: Add support for Adhoc Conference calls"
am: 0ab00030a2

Change-Id: If823ed425d02cf3b72e42b1ad68dc2c0937c50fd