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

Merge "[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f1 am: 1bc51470 -s ours am: c64e0d70 -s ours am: aff81a55 -s ours am: 158a067a -s ours am: 21bf4b12 -s ours" into tm-qpr-dev-plus-aosp am: 17636138 -s ours

am skip reason: subject contains skip directive

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



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