Merge "Mark RemoteAnimationControllerTest#testTimeout as flaky" into qt-dev
am: 80c94712de

Change-Id: I7b29b1c2acab57d9e147913d9cb8573113735aa4