Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290 am: 13ed847fb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049215 Change-Id: I8d4704fa51140a5350fcf3998567ae6178c4392e
This commit is contained in: