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

Change-Id: I35180b88fb0fbe6e624b183dd39a4247feb1c0cb