[automerger skipped] Merge "Add a new call direction parameter to conferences...

[automerger skipped] Merge "Add a new call direction parameter to conferences for multiparty" am: f5ed9171 am: 59d28c92 -s ours am: 7b8566e4 -s ours am: 336a8d52 -s ours am: e87a99d3 -s ours

am skip reason: Change-Id Icb576a07b9a7a81e228babfea53474be83da7593 with SHA-1 43e02659 is in history

Change-Id: Ia2b09731ff4632db39e51da2e593a2a679d48836