Merge "Added VSYNC and INTENDED_VSYNC timestamps to FrameMetrics API."