Merge "Dismiss keyguard when simpin auth'd and..." into sc-dev am: 42c4052f...

Merge "Dismiss keyguard when simpin auth'd and..." into sc-dev am: 42c4052f am: ab63a519 am: 7c41d5df am: 1203dee2 am: 149751ff

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



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