Merge "Add getHdrOutputConversionSupport to SurfaceComposerClient."