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

Change-Id: I821f4567613b8a5f55bf0d0451784a42cb25b56c