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

Change-Id: I4e0d52de2aabb33a4c1f86b3f651941b0d437702