Merge "Make CTS test testQuery more flexible" into oreo-mr1-cts-dev am: 9cf32632a5
am: 43701678e0

Change-Id: I8856317fd84557d7653a460c39756d4529264408