Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am: 3bd612f92b am: 1b94e6c444"