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

Change-Id: Ie0980604e89d8dde45b4e11ce8dd66f0a9f9c669