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

Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041 -s ours am: 7f5228be -s ours am: 5f06f5b4 -s ours am: 652fbbed -s ours" into udc-dev am: 89aa57bc -s ours

am skip reason: subject contains skip directive

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



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