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

Change-Id: If6bfd6e45b19f2dde2e5c83133ae9f0ff0a40adb