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

Change-Id: Ib93c18b5b04030d8b0840ce8a813bd57a982e1d0