Merge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f0 am:...
Merge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f0 am: 936166fd" into nyc-mr1-dev-plus-aosp
am: 76f5fac2
Change-Id: Id98bfdb5173f8514372f90a0ed6f2b699cc40b0b