[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041a1 -s ours am: 582d8e0262 -s ours am: 50f0b58d80 -s ours am: 5933a823ea -s ours

am skip reason: subject contains skip directive

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

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