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

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



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