Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f86
am: 2638216c83

Change-Id: I6f3dfc0bf046db21c5728f553202f3320070be00