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

Change-Id: Ie95d5d5e0127f91254e4331be8870d906421d5f3