Merge "Pass filtering to drawLattice" into sc-dev am: 417f6b1677

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c5f89ee1c4825b9f1bb1b3b3e9803a0d76cb8c