Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am: 3bd612f92b" into oc-dr1-dev-plus-aosp
am: 15476e332e

Change-Id: I5897c2c2280c404836e0e80e459972fbc34c528d