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

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

Change-Id: Ic839aef9eaa7f6cc37ddced323b4a30692fd2e9d