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

Change-Id: Ie3d6006ad5f9f63793b1bf7a73abc401d333e0ed