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

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

Change-Id: Ie31843d54bf6ea547791ffa0d270907654ca7885