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

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

Change-Id: I20645fd922e5908a8911fd7dc975f3ea4e053990