Merge "MediaCodecInfo: add FEATURE_HdrEditing"