Merge "Fix dumpsys SurfaceFlinger --frame-events"