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

Change-Id: Ib3ecc22ac840597a4332a8713ececb3adaec8d2c