Merge "Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev am: d1f55f6302 am: 9f23608173" into oc-dr1-dev-plus-aosp
am: 801559a611

Change-Id: I6ba3735f9a300bdf8a9f5b4371940756f527b559