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: If46d313c5837f85647e2c3413f8e24c1e29eeece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>