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

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



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