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

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

Change-Id: I130b0b080472833ca8c23b2ce3302d6e184887ca