Merge "[SurfaceFlinger] Don't touch hw vsync in DEFAULT RR with kernel timeout" into qt-r1-dev am: ddb5f84005
am: 78a54762e5

Change-Id: I9de0eccea25bec83f4bda9ee66ec99ddf5a9db60