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