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

Change-Id: I343ee531e2bf5f658ba0693c7e0e402b395dc282