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