Merge "jpegr mpf: fix bug" into udc-dev am: b833f58c

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



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