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

Change-Id: Iaf5119d0a27e8cdcec78ade905f9f91ded00d54a