Merge changes from topic "cherrypick-jpegr_stride-y7zr8fkboj" into udc-dev am:...

Merge changes from topic "cherrypick-jpegr_stride-y7zr8fkboj" into udc-dev am: a7bb35b7 am: b622142e

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



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