Merge cherrypicks of ['googleplex-android-review.googlesource.com/23858210'] into udc-release. am: 1145116447

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

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