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

[automerger skipped] Merge "Validate user on biometric auth and keyguard done" into udc-qpr-dev am: 90bf36c9 -s ours

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

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



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