[automerger skipped] Merge changes from topic "exif-webp" am: b2356e4d am:...

[automerger skipped] Merge changes from topic "exif-webp" am: b2356e4d am: 00ce3a35 am: 67ddcd19 am: 24da2739 am: c2fc4863 -s ours

am skip reason: Change-Id Ib6319e1b7b6711b071542d94ebfdc4a9f80e9c16 with SHA-1 2018d2bd is in history

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

Change-Id: Id82f7d013710c5a8ab86a0cbef796ad039d28382