Merge "Surfaceflinger: adjust content detection fps selection" into qt-r1-dev am: 9275c965d8
am: 3f4989a062

Change-Id: I6045d2b6b4671205501386054b6ea71d5e40709d