Merge "Add per-buffer perfetto trace points for SurfaceFlinger frame events"