[automerger skipped] Fix the settings crash when SimDialogActivity is null am:...

[automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64f am: a800c05a am: d65110a8 -s ours am: 444690e5 -s ours am: 79fc0d9e -s ours

am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d is already in history

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



Change-Id: Ib5dc6b867ccf78a5f0a639eeb359c1efa186a5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>