Merge "Camera: Propagate colorspace to heic composite stream" into udc-dev am: ef8816464f am: 28d11caa1d am: eee4174a37 am: 5aaa83bcf3

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

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