Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
am: 8bcd5bc5b0

Change-Id: I660aa6ba9a73788f65fcc9655fdc48cb1b0ef2b5