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

Change-Id: Ifc073571a999d5c99a2f4b364691b15e070bf95f