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

Change-Id: Ide6d7999704e46e1ec35644b68fcd5ee34382b40