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

[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b7 am: f3c6684b -s ours am: 5ddcc96b -s ours am: b7075acb -s ours am: 97f62577 -s ours am: 2dc68a9d -s ours am: dea5d660 -s ours am: 555c862e -s ours am: ae6a5eaa -s ours am: c357b1cc -s ours

am skip reason: subject contains skip directive

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



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