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

Change-Id: I5116803d89a5d85fc1a66fc6af6c0a91c824d178