Merge "Add carrier config for conference participants data support" into qt-dev
am: 23b6339ebd

Change-Id: Id1e5fcf1fbdfe47c73a8e76949ce4d75f03f9ed7