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: 582d8e02 -s ours am: 50f0b58d -s ours am: 5933a823 -s ours am: 31a5f9da -s ours" into tm-d1-dev-plus-aosp am: 551c77cc -s ours am: 0ca1b0e6 -s ours

am skip reason: subject contains skip directive

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



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