[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
am: 603dcc1856
-s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124
Change-Id: I715e838ade3a2eae24736c8fef55c18f21670a41
This commit is contained in: