Merge "Fix AppWindowTokenAnimationTests and add them to presubmit"