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

Change-Id: Iad5ee56a522081c41df40cc43d6fa3a8e3119050