Merge "Disable seamless rotation on flicker tests" am: 35d3ce82d4 am: 776b515187

Change-Id: I4280b8e6b758f71362971bcd40ac847d3eb49e85