Merge changes If449869b,I51a1791f into main am: 4c119abb25

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

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