Merge "Fix the issue that automatic mute state remains ON after adding VT call" am: ebd9bf21e5 am: 0821635baf
am: 534ce67669

Change-Id: Ib3966f8532045d22e19f7cec9d2d207ea1924ca7