Merge "SkQP: fix Filterable.filter" into android10-tests-dev am: eef3f22ed8 am: 255439f258

Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1137096

Change-Id: Ia3ae26d96146d69d512bbc3ab49b5d0e3a4d4435