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

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



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