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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040147

Change-Id: If19a0305ae9d7bf39931b3a23bc1e5e52cb7acfb