[automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339e am: c6931e3f -s ours
am: 519017ef -s ours
am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d is in history

Change-Id: I8b1bca2eef9840a087cdf3ce32443e4102f83b16