Merge "IMS: Recalculate conference on RTT mode change" am: 1b8eecde14
am: 1bbb7cab38

Change-Id: I5450c8ade7a47cfccfad47af0f0864a1c47b5892