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 am: 0aa99a9a

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



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