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

Change-Id: Iab2d3ed688e7605f0bea80f63b679751c17d2a14