Merge "Ensure correct read of jpeg header blob" into tm-dev am: e2d9f79f am:...

Merge "Ensure correct read of jpeg header blob" into tm-dev am: e2d9f79f am: 61b0f0d0 am: 936727be am: 4b791e21

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



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