[automerger skipped] Merge "Validate user on biometric auth and keyguard done"...

[automerger skipped] Merge "Validate user on biometric auth and keyguard done" into tm-dev am: f96d2b12 am: a8f9fbdb -s ours am: ff0e3fa2 -s ours

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

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



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