Merge "Enable SurfaceFlinger to use FrameTimeline"