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

Change-Id: I226684fb6178b09187b316611b1d05f431e12f3a