Merge "SurfaceFlinger: add frame rate to dumpsys" into rvc-dev am: a2fad15aac am: f43c7f19c8 am: 9a68af8105 am: 0d031fe389

Change-Id: If9539c2a06955fc5e75326e1c3ff88fed133161c