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