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 qt-dev am: c184d7b7 am: f3c6684b -s ours am: 5ddcc96b -s ours am: b7075acb -s ours am: 97f62577 -s ours am: 605261cc -s ours am: 1e7904dd -s ours am: e8b730b5 -s ours am: df8c08f7 -s ours" into tm-d1-dev-plus-aosp am: bf54253f -s ours

am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 3d89cc5d is already in history

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



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