am 487a7fb1: am 9e1c149f: am 499c2137: am 2e72fa25: Merge "fix for AutomationTest.testWindowAnimationFrameStats" into lollipop-mr1-cts-dev

* commit '487a7fb1c72ebf55bb67c1f513770c5193d895ef':
  fix for AutomationTest.testWindowAnimationFrameStats