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

Change-Id: If5d22e92e86acdd96f881048bfa25af1c4e3bbe5