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

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



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