am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"

* commit 'a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
  Fix a copy/paste typo in ViewPropertyAnimator