Merge "SurfaceFlinger: tune FPS detection logic" into qt-r1-dev am: 49a3fb445f
am: 4ca3eb3d10

Change-Id: I38508ccc7854c1a2d9c434603f71766eb5d2b6bb