Merge "SurfaceFlinger: Add DISPLAY_EVENT_FRAME_RATE_OVERRIDE"