Merge "AOD: Refactor doze brigthness controllers, add AOD auto brightness support" into oc-dr1-dev