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

Change-Id: I4bb89c8045d1aee0441882556819d0187a2349b8