[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
am: 535ebae5fb
-s ours am: 3bb45a9d9e
-s ours
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
is in history
Change-Id: Iac212ff8f42a5c8025a9fb296e8e04fd9cc61945
This commit is contained in: