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

Merge "[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661 am: 2ebce335 -s ours am: 13ac3a30 -s ours am: 7ef1e5f3 -s ours am: 65ea1811 -s ours am: e06f4746 -s ours am: 841bc866 -s ours" into tm-d1-dev-plus-aosp am: d673d224 -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/+/19952027



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