[automerger skipped] Merge "Dismiss keyguard when simpin auth'd and..." into...

[automerger skipped] Merge "Dismiss keyguard when simpin auth'd and..." into sc-dev am: 42c4052f am: ab63a519 am: 7c41d5df am: 1203dee2 am: 149751ff am: f12f638d am: edd97e8e -s ours am: 3573e6e8 -s ours

am skip reason: Merged-In Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4 with SHA-1 48fa9bef is already in history

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



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