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

Change-Id: I1705d3d1a3eed04689c72bd83251037ebda11d6f