Tests for switching to ANDing query terms together

Added some more tests and changed the expected results for the tests that
use empty prefixes - we now expect no results which should be ok.

Bug: 52904

Change-Id: I7e38d0fcaf94268b1a78766b0682563e96125b67
Merge "Tests for switching to ANDing query terms together"