[automerger skipped] Merge "Fixed incall UI to emulate single party call correctly when one participant dropped during conference creation." am: faa3989f37 am: b82527b670 am: c716cac63c
am: d28b8810f3 -s ours
am skip reason: change_id I2048ab6fbad428e1ae2fb2d65c7c95f541e131c2 with SHA1 44dbd5e34d is in history

Change-Id: I73acc0bd2aebd4a50e51a56704eb77f482b4f2e0