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

Change-Id: I4d60ef50bf14870c89f10bce16a77703ad08b59a