[automerger skipped] Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2ca am: 756d9c11 am: 59349f30 am: a696a363 -s ours

am skip reason: skipped by user patb

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

Change-Id: I4772aa4a2c34cb4958bba8c00d7fbb46ad906bed