Merge "Ims: Add support for Adhoc Conference calls"
am: ba248894ac

Change-Id: I54b6648f6647ef6f39683f466173800bd96fdfc6