Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2
am: 710dfc1bec
am: 3901996e1d
Original change: undetermined Change-Id: I2312410a6941484b0a37ce14be753e1f92d37dfe
This commit is contained in: