am 3002bb4e: Merge "Fix AnimationTest#testSetAnimationListener" into jb-dev

* commit '3002bb4e43403ed21461a88d664da4e90a8ca4c1':
  Fix AnimationTest#testSetAnimationListener