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

Change-Id: I76cd17bf22d0604505e038f4f25f45af3c479908