Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev...
Merge "Merge "Don't animate grayscale if animations are off" into oc-dr1-dev am: ab7af71c" into oc-dr1-dev-plus-aosp
am: 4a17866a
Change-Id: I74bdb99daa76266ea2f4a6a62f3f4dafffcbf45b