Merge "Migrate FILTER_APPLICATION_QUERY" am: 714960f745 am: 9aa009684b am: fe2b1a414c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492847

Change-Id: I1d179c79948d987f4b0d51f642ddf81b99f28e2b