Merge "User cannot reject a waiting call after a switch call fails"
am: 3af6219876

Change-Id: I28ee6808eec99051299228cbf3bef72b0845cf82