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

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



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