Merge "Update HwcCompositionType in proto." into main