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: 05d176b9

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



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