[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5df6 -s ours am: 65091e4cac -s ours am: 1516a9c1bc -s ours am: 5e78a73c55 -s ours
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19990545
Change-Id: Ifd1b025ddd28f4e3e3dc14e5c8ffc8d9d5be00ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: