Merge "Prevent ExifInterface incorrectly copying a WebP padding byte" am: efdf0d6cde am: 83df98e8d3

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

Change-Id: Id716c1743aa25d75aa05429e311dc611d2767e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>