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