Merge "Camera: Propagate colorspace to heic composite stream" into udc-dev am: ef8816464f am: 094416c739

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

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