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

Change-Id: I29252efebec6b6b66530fc18dc11b537f8d0dcc5