Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev