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

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

Change-Id: I2be8a6963af344baffe0ee8c0c2c8f0e7253606a