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

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

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