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