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

Change-Id: Ic9659faf028f4867fed8e1cfcffbd8fe50d9fd9a