Merge "Don't animate grayscale if animations are off" into oc-dr1-dev
am: ab7af71c64

Change-Id: I598597675ce0dd2373625ac1968217e42576b692