Merge "AOD: Add support for dimming in software" into oc-dr1-dev