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

Change-Id: I8cb3bfb88fb3085f72505b7b0872877eaef68e93