Merge "Merge "Log keyguard transitions after biometrics" into rvc-dev am: a5f7670b4c am: d2f6974ca7" into rvc-d1-dev-plus-aosp