Merge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f077 am: 936166fd5b" into nyc-mr1-dev-plus-aosp