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

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

Change-Id: Ib81bef18d09760f9c3674e520fa7a2f9f9928da3