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

Change-Id: Id6b933cf846949be953eb46558f1792453e0bee7