Merge "Add carrier config for conference participants data support" into qt-dev-plus-aosp am: 004f06d79a
am: 5b8c28b9c3

Change-Id: I51cec42e282d8d4c48fdd66678e36474ac7b99cf