[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours am: 633fb21411 -s ours am: 08e0f19067 -s ours am: ec6100243b -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: Iefef9fc9ed8d5a533193259fd8033a219b6070d0
This commit is contained in: