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

Change-Id: Ia0b9b23c25798059715399e234d12ccca8fdacfc