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

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



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