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

Change-Id: I42ac8090c978c7b42ab11c19a89e4c15327c0a8f