Merge "Fix conference call cannot be hung up"
am: a8f8245aef

Change-Id: I7ff951f701216ae17a83113ae4ab9918aa0b6a49