Merge "[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am:...

Merge "[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5d -s ours am: 79d9a44b -s ours" into tm-d1-dev-plus-aosp am: 3bd3f468 -s ours am: 8e821bda -s ours

am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 3d89cc5d is already in history

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



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