Merge "Merge "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" into oreo-mr1-cts-dev am: 0366056a0e"