[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6
am: a800c05ac7
am: d65110a8ff
-s ours am: 444690e5ec
-s ours am: 8c636211e4
-s ours
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: I130c02259002697830a03263d4ef13b30a3af334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: