Merge "Revert "Fix conference call cannot be hung up""
am: df83f91e60

Change-Id: I46f18711a79c649b1a2dea33880f99cdda83feac