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

[automerger skipped] Merge "Validate user on biometric auth and keyguard done" into udc-dev am: 0adf4f5d am: 46f9346e -s ours am: acce3c23 -s ours

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

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



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