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