Merge "Only use legacy_usage for legacy query" am: 0077d6d84c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2193375

Change-Id: I014ac3e523f8f6f004f6f3b7ff8f00bd7acce172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>