Merge "fix for AutomationTest.testWindowAnimationFrameStats" into lollipop-mr1-cts-dev