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: I8a0d5e6c7b1c90828b24ed1a5e951dec9ceca84e