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

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



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