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

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

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



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