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: 763c1d1e
Change-Id: I78fe9027d1af153226243290e7461a09544d88c1