Merge "Prevent errors when updating operator pref summary" am: 5a19cea4 am:...

Merge "Prevent errors when updating operator pref summary" am: 5a19cea4 am: c855a8a2 am: 455d7924 am: 43cff6ba

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

Change-Id: I95587957bbfe79c37dd1246d3bec0a67201d217f