Merge changes from topic "webp_contentResolver" am: 1b6354f7ec am: 538289b2ca

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

Change-Id: I1df6b1750f4800c7a7c2036684e3cd5a2c50fd61