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

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

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



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