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

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

Change-Id: Iea74cb372f2703da46265c3e958aac7162949b0f