Merge "Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f am: 2168aff8" into oc-mr1-dev-plus-aosp