[automerger skipped] Merge "RESTRICT AUTOMERGE: Make CTS test testQuery more flexible" into oc-dev am: c9ddd200bc am: 8b043c30bb am: 82e2b16184  -s ours am: 2140a48932
am: 7459ae2e63  -s ours

Change-Id: Icdaf35e441091e15081c6c104f420b084e0ad071