Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev
am: 628ef43532

Change-Id: I8ec5e779dcf6470dac9a84404f6b58a8cad2db12