Convert category__and to category__in (less expensive) and unset it when only one category is passed. Adds unit tests.
category__and
category__in
Fixes #24245.