[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
am: 535ebae5fb
am: 375b565eb4
am: 38495e875b
-s ours
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
is in history
Change-Id: I3eef661f34cfb90f846ec4602b0b74e91e97edb3
This commit is contained in: