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

Change-Id: I95b9aa4773fafb62d5c8d440a90a93d8cfd54db3