Merge "Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7f am: 97f7dbb0" into oc-dr1-dev-plus-aosp