Merge "Camera: Round off Jpeg/R stream size correctly" into udc-dev am: 3f012a26 am: 4daf4a21

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



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