[InstCombine] adjust branch on logical-and fold

The transform was just added with:
115d2f69
...but as noted in post-commit feedback, it was
confusingly coded. Now, we create the final
expected canonicalized form directly and put
an extra use check on the match, so we should
not ever end up with more instructions.