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

Change-Id: If337fd17b70a2608b174c373719fb069050e2ab5