Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev
automerge: a5945ee

* commit 'a5945eea2eb65681b931afe734a112ee4fbfefee':
  fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL