Stop call waiting tone when call gets answered

If the call being answered is the only ringing call, stop the call
waiting tone even if it's still in the ringing state.

Bug: 27659457
Change-Id: I5afb3843fc1c27575947f933bb50e7b664c718dc