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

Change-Id: Iac203351003c8e6d9ceafb4c57203c6181208f4e