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

Change-Id: I827275c8f348d3440c7034ebc9e5b120645b8b48