[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM...

[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041 -s ours am: 582d8e02 -s ours am: 50f0b58d -s ours am: 5933a823 -s ours am: c3657db7 -s ours am: d7cf9b4b -s ours

am skip reason: subject contains skip directive

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



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