Merge changes from topic "exif-webp" am: b2356e4d98

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431429

Change-Id: Ib0ff39b30ba8636006cc66bd8e31e691722e5742