[automerger skipped] Merge "Merge "Pre-cache filter results" into rvc-dev am:...

[automerger skipped] Merge "Merge "Pre-cache filter results" into rvc-dev am: 7da3f04b am: 9bc32cf6" into rvc-d1-dev-plus-aosp am: 247704b9 -s ours am: 0c69f25f -s ours

am skip reason: Change-Id I3fb7d7cf8b98c7623caf04544523f1bbd07d1795 with SHA-1 c68d8124 is in history

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

Change-Id: I715d1acded88c505e5cf33b54609bdcb533634d9