am bf028ee3: Merge "Remove flakey ObjectAnimatorTest" into jb-dev

* commit 'bf028ee341edf10954ce787372c0d53058385442':
  Remove flakey ObjectAnimatorTest