Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff
am: 97f7dbb004

Change-Id: I8ad8f455a430b7230f9f83dc5b0967db4a540e87