[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
-s ours am: 01b5c4b51f
-s ours
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
is in history
Change-Id: Ice6979bfa5ec74ae5802fe156fe3b1a475db5bd1
This commit is contained in: