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

Change-Id: I2ab9a1842c6e9a5acdde4d5c3470bf645aa55e18