Merge "Merge "Log keyguard transitions after biometrics" into rvc-dev am: a5f7670b am: 299d544b am: b08edfd5" into rvc-qpr-dev-plus-aosp