Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev