[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: e53e389f58 -s ours am: d05aafbcbf -s ours am: ecca4988f8 -s ours am: 9325dc44cd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19951101 Change-Id: Ibac3b479e6379687d7124306241b80f048a17572 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: