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

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



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