Merge "Add carrier config for conference participants data support"
am: 93931ccb81

Change-Id: I67c0e554fbeec03561ff4a698f4a15a803bc7611