Merge "Remove flaky AppWindowToken tests from presubmit"