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

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



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