Merge changes I468fe3ef,I7632c4af into main am: a2c9a48d57

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

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