Merge changes from topic "webp_contentResolver" am: 1b6354f7ec

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

Change-Id: I2ed207e684bd343ec1349544b7a86dac3607f571