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

Change-Id: Ib82f164a0c7e3cc1caf9057766cbffb168d9607f