Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08