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

[automerger skipped] Merge "Pre-cache filter results" into rvc-dev am: 7da3f04b am: 00c9a1f7 am: f95d85fc am: 337678d7 -s ours

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

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

Change-Id: I831530a3c4bca4b7183c25579963c385209c31b8