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

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



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