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