Merge "Merge "[AppsFilter] skip recompute mQueriesViaComponent for snapshot"...

Merge "Merge "[AppsFilter] skip recompute mQueriesViaComponent for snapshot" into tm-dev am: c49dfd94 am: 4b19aed7" into tm-d1-dev-plus-aosp am: 9f82318b

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



Change-Id: I7d5a9f312c61d04b0fa01673685f84b906e86df8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>