[automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7
am: 51c080aaf9
-s ours am: 3896ca809a
-s ours am: 0ab49a04ac
-s ours
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521
is in history
Change-Id: Ifd5afd9273d12613306e34d87d559eafd57b64e2
This commit is contained in: