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: df77db76 am: 437d3541 am: 3dcf98b9

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



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