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

Change-Id: Ic38e272a6556d25c21b5842e66f70d9fc00d7afa