tree b1f31bb5eda932ee1b4c03227812b6f82148173f
parent 27a667d8f616df0db734bd547e2d5e3d721e0145
parent 811959364df18c020aa974a1f667d15b75f8d788
author zhongjun.chen <zhongjun.chen@unisoc.corp-partner.google.com> 1594753091 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594753091 +0000

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