[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release. am: 9dd8bd79f2

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

Change-Id: Ibe4874ac9335fd3cd608fbc3eb9003c41362b203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>