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