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 skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f1 is already in history

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



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