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

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

Change-Id: I5e15ed49f50b9b9e3df50910f7fd3dc55d662a09