Merge "SurfaceFlinger: add support for FrameRateCompatibilityType"