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: 2d7e2430 am: 229851f9

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



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