Merge "Migrate FILTER_APPLICATION_QUERY" am: 714960f745

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

Change-Id: I3579dadeec330fc1c1097d617191e451f6518c52