Escape query string during phrase search detection

This makes $extraQueryStrings no longer required.  It had the nasty
habbit of not preserving the order of the clauses which broke boolean
parameters.

Bug: 56239
Change-Id: Ic1273d9c00a87abbb53a003d267535078b43fd25
Tests for boolean operators around quotes

Bug: 56239
Change-Id: I306e16d04c41deb5744d4050025c8bae836159fe
Merge "Escape query string during phrase search detection"
Merge "Tests for boolean operators around quotes"