[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN...

[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78b am: 603dcc18 -s ours am: 0f7a0642 -s ours am: 633fb214 -s ours

am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124

Change-Id: Ia75fb4de72f25ce6fbfc74f926262eff63b3bede