Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev...
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am: 861b35e1 am: d536ba3f
am: 1696f631
Change-Id: Ibbc0f4d9bd2ea414e82f48050f65ef3665cfc544