[automerger skipped] Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5  -s ours skipped: 4c5d3c8bd6 skipped: a7d3ba097f

Change-Id: I8c1429ad404dc4a6228d613e54b27bd598d45ab4