[Cros SR] Replace finch flag for query-based non-apps model.

In M75, we used the EnableAdaptiveResultRanker flag for the QBNA model.
Change this to EnableQueryBasedMixedTypesRanker for M76 for consistency
with our other flags. This CL will be followed with a corresponding
change to the Finch GCL file.

Since we don't use the EnableAdaptiveResultRanker flag for anything
else, this CL also removes it.

Bug: 931149
Change-Id: I130b19b0d5f2a6b18e074ac1945a4df861577967
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1623727
Reviewed-by: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Jia Meng <jiameng@chromium.org>
Commit-Queue: Tony Yeoman <tby@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662898}
6 files changed