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