Merge "jpegr library: add multi-picture format support" into udc-dev am: d046f988 am: c08175d0

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



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