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

Change-Id: I8c16496b18d5aca4c570e45a000081790c16ac78