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

[automerger skipped] Merge "Validate user on biometric auth and keyguard done" into tm-qpr-dev am: 0bd90f22 -s ours am: 421117c9 -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: I8baa4c245e27310db75b1378c41a72447681f961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>