Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev
am: 9990dedab5

Change-Id: I2b1225ce601495eef491558098e256c3cd6f0eeb