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: 2dc68a9d -s ours am: dea5d660 -s ours am: 0769cfda -s ours" into udc-dev am: 5dc3f396 -s ours

am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 37aeb26b is already in history

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



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