[automerger skipped] Validate user on biometric auth and keyguard done am:...

[automerger skipped] Validate user on biometric auth and keyguard done am: e5cb7381 -s ours am: 5baf5cf6 -s ours

am skip reason: Merged-In I70efe8704931e096698d4a775ee487bb5241d7f1 with SHA-1 e343f990 is already in history

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



Change-Id: I2af8bfa6000b2ba48272f1d1cbdcce8092ff4345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>