Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev