Revert "Do not finish lockscreen for multiple sims."

This reverts commit 0f0a5bd651d6184ed6c45e1cd8069bb8f09559d1.

Reason for revert: automerge conflicts

Change-Id: I5b696f3cc7d364458630ba3510961caee6ef66d8
2 files changed