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

Change-Id: I4030670dd2f0068511dba0f4ccb4e49138b748d5