Merge "Camera: Attach Jpeg/R composite stream metrics" into udc-dev am: d24e38bb

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



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