Merge "Include janky runs on flicker rotation tests"
am: 3341bbefea

Change-Id: I05d509ca9ceb0d14725c25f90de4381fd1ff5241