Merge "Camera: Propagate colorspace to heic composite stream" into udc-dev am: ef881646

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



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