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