Merge "Camera: Update JPEG size override condition for MPC13" into sc-v2-dev am: 1efdec0980

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

Change-Id: I7e55ac5aa88aee72792fdb91cc78a90e49687c49