Merge "SurfaceFlinger: add frame rate to dumpsys" into rvc-dev