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

Change-Id: I72f3175ee0bd723a6570c7f5dd3d9088ef39ea05