Cherry-pick from android10-tests-dev into future revisions. am: 4f007aba95 am: 811959364d

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

Change-Id: I89b8363bbcab90ee98ef4b05fa36760e9cf16646