Bug: skia:8243, skia:9255 Change-Id: I006d1bace2bec5ea24b0e2be560a8ff26127f503 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227402 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>