Merge "Only use legacy_usage for legacy query" am: 0077d6d8 am: 521c3936 am: 7a679002

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



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