[automerger skipped] Merge "Fix sim pin lock preference disappear in dual...

[automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966 am: 51c080aa -s ours am: 3896ca80 -s ours am: 0ab49a04 -s ours am: 8ffc80ce -s ours

am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d545545 is in history

Change-Id: I7617bb49f01e5a44c4e08fa2c1aa32bd46fed6a7